Commit Graph

26 Commits

Author SHA1 Message Date
544efe0207 Merge pull request #115 from jsoref/spelling
Spelling
Upstream-commit: 4ffefe4a1f
Component: cli
2017-06-14 09:58:55 +02:00
8b832283fa Merge pull request #111 from keloyang/attach-restarting-check
Add a restarting check to runAttach
Upstream-commit: ab3ea637b6
Component: cli
2017-06-08 12:53:15 +02:00
b190ae1082 Add a restarting check to runAttach
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
Upstream-commit: 90f497302f
Component: cli
2017-06-08 07:12:39 +08:00
8d3a4135a1 Replace command.DockerCli to command.Cli in docker attach/exec command
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
Upstream-commit: e8cc2cf760
Component: cli
2017-06-08 07:03:52 +08:00
a920b458df Update vendoring of docker/docker
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 44ac80881f
Component: cli
2017-06-06 00:23:21 +02:00
d1013c3e75 Merge pull request #102 from keloyang/attach-block
Recheck the container's state to avoid attach block.
Upstream-commit: 61c0b9f78d
Component: cli
2017-05-24 12:09:38 +01:00
38cfa2ee6d Spelling fixes
* appropriate
* assumption
* attach
* because
* building
* customized
* mapping
* propagated

Signed-off-by: Josh Soref <jsoref@gmail.com>
Upstream-commit: 70a9905ee5
Component: cli
2017-05-22 01:39:06 +00:00
1959f587f4 Recheck the container's state to avoid attach block.
If use docker attach command to attach to a stop container, it will return
"You cannot attach to a stopped container" error, it's ok, but when
attach to a running container, it(docker attach) use inspect to check
the container's state, if it pass the state check on the client side,
and then the container is stopped, docker attach command still attach to
the container and not exit.

Signed-off-by: Shukui Yang <yangshukui@huawei.com>
Upstream-commit: f9dc3337f9
Component: cli
2017-05-20 08:02:06 +08:00
6ff9bdf996 Merge pull request #80 from AkihiroSuda/adjust-docker-stats
[Carry moby/moby#32777] Adjusted docker stats memory output
Upstream-commit: 85c2330dfa
Component: cli
2017-05-18 01:55:52 +02:00
6ab9e202e7 Refactor holdHijackedConnection
It has been refactored to a hijackedIOStreamer type which has several
methods which are used to prepare input and handle streaming the input
and output separately.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 6eca53c7ae
Component: cli
2017-05-17 15:18:01 -07:00
96f059a410 Update CLI package with containerWait changes
The docker/client package was updated to support the updated Container
Wait API functionality. The run and start commands have been updated to
use the new wait features.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 38591f20d0
Component: cli
2017-05-17 11:44:54 -07:00
2d89d443c2 Fix float64 comparison in stats_helpers_test.go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 3c78bc775c
Component: cli
2017-05-16 02:13:00 +00:00
798e7f5d71 Adjusted docker stats memory output
Signed-off-by: Sergey Tryuber <Sergeant007@users.noreply.github.com>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 82600b7021
Component: cli
2017-05-16 02:00:47 +00:00
242da31a23 Update cli imports to using local package
Also, rename a bunch of variable to not *shadow* the `opts` package
name.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d7f6563efc
Component: cli
2017-05-15 14:45:19 +02:00
148130f314 client: check tty before creating exec job
This is necessary in order to avoid execId leaks in the case where a
`docker exec -it` is run without a terminal available for the client.
You can reproduce this issue by running the following command many
times.

  % nohup docker exec -it some_container true

The container `some_container` will have execIDs that will never
normally be cleaned up (because the client died before they were
started).

In addition, this patch adds a docker-inspect step to ensure that we
give "container does not exist" errors consistently.

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: ee7a956c54
Component: cli
2017-05-09 21:07:40 +10:00
5a1580a2fc Add line length linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c31d25653f
Component: cli
2017-05-08 15:57:56 -04:00
edf78faba7 Add interfacer linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 37ccc00d0e
Component: cli
2017-05-08 15:57:50 -04:00
2ff5f1eac9 cli: gofmt + goimports
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 295140edf2
Component: cli
2017-05-08 10:51:30 -07:00
82b8acb640 rm client and vendor it instead
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 57230a7212
Component: cli
2017-05-08 10:33:56 -07:00
752e3db428 do not allow duration less than 1 ms in healthcheck parameters
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: a316b380e7
Component: cli
2017-05-03 17:46:40 -07:00
7a4be5671b remove --init-path from client
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dea809813e
Component: cli
2017-05-03 17:46:39 -07:00
dce23b177f Add gocycle lint
Whitelist some existing offenders, and use a high limit for now.
This limit should decrese over time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 08af0f28c5
Component: cli
2017-05-02 17:57:46 -04:00
67b6e94f47 Enable golint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 690ef8af79
Component: cli
2017-05-02 17:57:46 -04:00
93938768a0 Add gometalinter to CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e3f677794a
Component: cli
2017-05-02 17:15:56 -04:00
82309a74cd Update imports.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 10641c2aae
Component: cli
2017-04-17 18:07:56 -04:00
b2d0c4c107 Import docker/docker/cli
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 1630fc40f8
Component: cli
2017-04-17 17:40:59 -04:00