* appropriate
* assumption
* attach
* because
* building
* customized
* mapping
* propagated

Signed-off-by: Josh Soref <jsoref@gmail.com>
This commit is contained in:
Josh Soref 2017-05-22 01:39:06 +00:00
Родитель 883d28cfce
Коммит 70a9905ee5
8 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -163,7 +163,7 @@ func (h *hijackedIOStreamer) beginInputStream(restoreInput func()) (doneC <-chan
if err != nil {
// This error will also occur on the receive
// side (from stdout) where it will be
// propogated back to the caller.
// propagated back to the caller.
logrus.Debugf("Error sendStdin: %s", err)
}
}

Просмотреть файл

@ -146,12 +146,12 @@ func runStart(dockerCli *command.DockerCli, opts *startOptions) error {
fmt.Fprintln(dockerCli.Err(), "Error monitoring TTY size:", err)
}
}
if attchErr := <-cErr; attchErr != nil {
if attachErr := <-cErr; attachErr != nil {
if _, ok := err.(term.EscapeError); ok {
// The user entered the detach escape sequence.
return nil
}
return attchErr
return attachErr
}
if status := <-statusChan; status != 0 {

Просмотреть файл

@ -226,7 +226,7 @@ size: 0B
Context{Format: NewContainerFormat("{{.Image}}", false, true)},
"ubuntu\nubuntu\n",
},
// Special headers for customerized table format
// Special headers for customized table format
{
Context{Format: NewContainerFormat(`table {{truncate .ID 5}}\t{{json .Image}} {{.RunningFor}}/{{title .Status}}/{{pad .Ports 2 2}}.{{upper .Names}} {{lower .Status}}`, false, true)},
`CONTAINER ID IMAGE CREATED/STATUS/ PORTS .NAMES STATUS

Просмотреть файл

@ -11,7 +11,7 @@ import (
)
// waitOnService waits for the service to converge. It outputs a progress bar,
// if appopriate based on the CLI flags.
// if appropriate based on the CLI flags.
func waitOnService(ctx context.Context, dockerCli *command.DockerCli, serviceID string, opts *serviceOptions) error {
errChan := make(chan error, 1)
pipeReader, pipeWriter := io.Pipe()

Просмотреть файл

@ -237,7 +237,7 @@ type logWriter struct {
func (lw *logWriter) Write(buf []byte) (int, error) {
// this works but ONLY because stdcopy calls write a whole line at a time.
// if this ends up horribly broken or panics, check to see if stdcopy has
// reneged on that asssumption. (@god forgive me)
// reneged on that assumption. (@god forgive me)
// also this only works because the logs format is, like, barely parsable.
// if something changes in the logs format, this is gonna break

Просмотреть файл

@ -233,7 +233,7 @@ func writeOverallProgress(progressOut progress.Output, numerator, denominator in
type replicatedProgressUpdater struct {
progressOut progress.Output
// used for maping slots to a contiguous space
// used for mapping slots to a contiguous space
// this also causes progress bars to appear in order
slotMap map[int]int

Просмотреть файл

@ -25,5 +25,5 @@ echo "Downloading OSX SDK"
time curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz \
-o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz"
echo "Buidling osxcross"
echo "Building osxcross"
UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh > /dev/null

Просмотреть файл

@ -158,7 +158,7 @@ func TestValidateDNSSearch(t *testing.T) {
`foo.bar-.baz`,
`foo.-bar`,
`foo.-bar.baz`,
`foo.bar.baz.this.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbe`,
`foo.bar.baz.this.should.fail.on.long.name.because.it.is.longer.thanisshouldbethis.should.fail.on.long.name.because.it.is.longer.thanisshouldbethis.should.fail.on.long.name.because.it.is.longer.thanisshouldbethis.should.fail.on.long.name.because.it.is.longer.thanisshouldbe`,
}
for _, domain := range valid {