docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
30,296 Commits 12 Branches 296 Tags
19d7fa67013f579e16dc3ebb58fab70bf64174d4
Commit Graph

30296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Davis
19d7fa6701 Merge pull request #30164 from xulike666/fix-typo-5/36 
fix typo in container/container.go 
Upstream-commit: b65f7ea7ae255a0a59c6b5c9667b78db6c9b4f70
Component: engine
 2017-01-14 09:14:52 -05:00
Brian Goff
ea092d3119 Merge pull request #30125 from albers/completion-plugin-install--disable-content-trust 
Add bash completion for `plugin install --disable-content-trust`
Upstream-commit: 1bbd75c743df8310fefb7ac026e7aa1d8228cac1
Component: engine
 2017-01-14 09:04:51 -05:00
Brian Goff
534eaa5cc1 Merge pull request #30103 from TDAbboud/29961-add-error-checking 
Add error checking for hostPort range
Upstream-commit: 78db6379a85de68ba1b5fb39421a8fa8b56cd28b
Component: engine
 2017-01-14 08:43:27 -05:00
Brian Goff
210ffa1f3c Merge pull request #30161 from xulike666/fix-typo-4/36 
fix typo in api/types/client.go
Upstream-commit: 728566c4ad93f84469ffa8406b6a3cb4ea9f74a6
Component: engine
 2017-01-14 08:24:49 -05:00
Brian Goff
3f708cc745 Merge pull request #30160 from xulike666/fix-boring-typo 
fix typo in api/types/time/timestamp.go
Upstream-commit: 1847f855b33df2e412f7493376fce58e986aede0
Component: engine
 2017-01-14 08:22:31 -05:00
Aaron.L.Xu
3f53a9ea1d fix typo in container/container.go 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: 32035ffea57ef566a80a98ab69f9d30b55b59c08
Component: engine
 2017-01-14 15:23:33 +08:00
Aaron.L.Xu
1145a3c593 fix typo in api/types/client.go 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: c8fd28f12e501c3ba1bea9d380a38f4af8319a41
Component: engine
 2017-01-14 15:10:08 +08:00
Aaron.L.Xu
8a50ed9dc7 fix typo in api/types/time/timestamp.go 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: 2859ce6a577a9eac2c1610b76c156a5eb06cee83
Component: engine
 2017-01-14 14:16:03 +08:00
Tony Abboud
af2c613c23 Add error checking for hostPort range 
This fix catches the case where there is a single container port
and a dynamic host port and will fail out gracefully
Example docker-compose.yml snippet:
    port:
        ports:
            - "8091-8093:8091"
            - "80:8080"

Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
Upstream-commit: 135f8f967488f171fcda6c66d7fa35726edaf19c
Component: engine
 2017-01-13 18:05:51 -05:00
Alexander Morozov
aa503cd1f7 Merge pull request #30112 from Microsoft/jjh/graphdriver 
Windows: Remove redundant 'GraphDriver() func
Upstream-commit: 1eafa0f706931a0f3f73c756df3fa50639eae7a2
Component: engine
 2017-01-13 13:59:12 -08:00
Vincent Demeester
3650feec46 Merge pull request #28720 from jlhawn/add_secret_update_method 
Add SecretUpdate method to client
Upstream-commit: bd9361b8105518a9331f17d3f5fb2deed6a16c13
Component: engine
 2017-01-13 21:28:43 +01:00
Sebastiaan van Stijn
0b5a082fc0 Merge pull request #30131 from xulike666/fix-typo 
fix typo in mount.go
Upstream-commit: ca00c185304c630fa7d24d7b7bb4781849f7f8ea
Component: engine
 2017-01-13 20:40:34 +01:00
Josh Hawn
29e36c572d Add SecretUpdate docs to api/swagger.yaml 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 1cd5af59bffb6ee38f3599443abdcc30359bd521
Component: engine
 2017-01-13 09:51:12 -08:00
Josh Hawn
fe46c62362 Add SecretUpdate method to client 
closes #28678

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

Update cli/command/service/update_test.go

Fixes test build error:

  secretAPIClientMock does not implement "github.com/docker/docker/client".SecretAPIClient (missing SecretUpdate method)

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 77b8465d7e68ca102d7aae839c7b3fe0ecd28398
Component: engine
 2017-01-13 09:51:05 -08:00
Kenfe-Mickaël Laventure
68df9002fb Merge pull request #30120 from thaJeztah/revert-argument-name-change 
revert "virtualSize" name change
Upstream-commit: f858d49483289e8f25378a66b9b72dc08d2d9974
Component: engine
 2017-01-13 08:54:27 -08:00
Sebastiaan van Stijn
8146a5de0f Merge pull request #30132 from albers/completion_hide_legacy_commands 
Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion
Upstream-commit: 2dd3aa608dbb5bbd6d656cda61bed13310e88496
Component: engine
 2017-01-13 16:18:58 +01:00
Vincent Demeester
c578d47854 Merge pull request #30130 from ijc25/clarify-cp-docs 
Clarify `cp` documentation behaviour with trailing "/."
Upstream-commit: 8b7ba17d33d6af5fda28e86f2aa357be493f2cb8
Component: engine
 2017-01-13 16:16:03 +01:00
Harald Albers
2ac8b7a385 Honour $DOCKER_HIDE_LEGACY_COMMANDS in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aa006f128065fa8b1f017d1fdfdfebdbd08e31c9
Component: engine
 2017-01-13 15:43:52 +01:00
Aaron.L.Xu
af9ca905a5 fix typo in mount.go 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: e0621c53af1ac7dfb63f212743db17a0d67ca0e6
Component: engine
 2017-01-13 22:36:32 +08:00
Ian Campbell
c5380c7534 Clarify cp documentation behaviour with trailing "/." 
Issue #30082 demonstrated that their is possible confusion with the "/."
where the tailing "." can appear to be merely punctuation within the
document rather than a highly pertinent part of `SRC_PATH`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: fca6cda4b0307d1268e684dde65e6a916d729d04
Component: engine
 2017-01-13 13:58:25 +00:00
Harald Albers
1823a6c5fd Add bash completion for plugin install --disable-content-trust 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 725a864a0496a6c10f56c30f8a45234230951343
Component: engine
 2017-01-13 11:56:50 +01:00
Sebastiaan van Stijn
9875c5c0d3 revert "virtualSize" name change 
Commit b717de5153db503fae61c11e30f04f400f66a6fd
changed the name of the "size" argument to
"virtualSize", as the "VirtualSize" field
was re-used for calculating the size of all
layers _not_ used by other images.

be20dc15af0cb281bd6d11586cfcc96bd50d12ca reverted
the change in calculation, but did not change
the argument name back to "size".

This changes the name back to its original
name, because since the introduction of the
content-addressable store in docker 1.10,
there no longer is a "virtual" size, so
"size" is a better name for this argument.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 22c411517a4a203690edb52fa42f8d5b43252882
Component: engine
 2017-01-13 10:25:03 +01:00
Sebastiaan van Stijn
a9065717ae Merge pull request #30061 from yongtang/30027-docker-images-v1.12 
Fix `Size` in `docker images` for v1.12 client to v1.13 daemon
Upstream-commit: 0b09d6bfa7af18763d0f4a74f179117a73e70e46
Component: engine
 2017-01-13 02:11:48 +01:00
Brian Goff
2cf38188cb Merge pull request #30039 from ripcurld0/specify_line_no_dockerfile_err 
Specify in which line the Dockerfile parser failed
Upstream-commit: 597843e79040a4f00bfe2abd83343d43edd195f5
Component: engine
 2017-01-12 19:48:45 -05:00
John Howard
9768c5da08 Windows: Remove redundant 'GraphDriver() func 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2cd8bcd7df1b1a204fe20118afe9556fe5a0b7ba
Component: engine
 2017-01-12 15:32:46 -08:00
Michael Crosby
5db27accf5 Merge pull request #30106 from runcom/fix-upgrade-from-1.10 
daemon: honor default runtime when starting containers
Upstream-commit: f65212d5b96a18349b0f436c35f99e4eed13f7c9
Component: engine
 2017-01-12 14:44:37 -08:00
Antonio Murdaca
89de8e187c daemon: honor default runtime when starting containers 
If you created containers from pre-OCI docker (e.g. docker-1.10.x)
upgrade may fail when restarting containers if the new docker daemon
has `--default-runtime` set.

In Fedora, we ship docker 1.12.6 with:

```
--default-runtime=oci
--add-runtime oci=/usr/libexec/docker/docker-runc-current
```

That way we don't rely on `docker-runc` being in `$PATH`.

The issue is, on upgrade from docker 1.10.3 without this patch, the
default runtime in `daemon/start_linux.go` is unconditionally set to
`runc=docker-runc` without honoring the `--default-runtime` flag set in
the docker daemon.

Reproducer:

- (1.10.3) `docker run -d -p 5000:5000 --restart=always --name registry
registry:2`
- upgrade to docker 1.12.6 (1.11.x has likely the same issue)
- the registry container fails to restart on upgrade with the following
log message `error="exec: \"docker-runc\": executable file not
found in $PATH: \"\""`

That error comes from the fact that we're setting the runtime in the
container's HostConfig to `runc` where instead we should have honored
the `--default-runtime` flag (in our case that's set to `oci`).

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 9391a822ea4bee60284b4b2eb3a6535e20492569
Component: engine
 2017-01-12 20:36:22 +01:00
Tõnis Tiigi
d11c4417e8 Merge pull request #27903 from kim0/master 
zfs: expose mountpoint/dataset on inspection
Upstream-commit: 27695cd751c2bf6295b751b913893bbe72304b96
Component: engine
 2017-01-12 11:28:07 -08:00
Kenfe-Mickaël Laventure
e808d12650 Merge pull request #30088 from tonistiigi/fifo-close-early 
Close stdout/stderr fifo as soon as possible
Upstream-commit: f018c0dfff3c3dc213b3d3c05228dfed4ef0fb4a
Component: engine
 2017-01-12 09:29:39 -08:00
Vincent Demeester
52878055d1 Merge pull request #29485 from ericcurtin/remove-prompt-add-docker-group 
Don't encourage adding user to docker group
Upstream-commit: 06e3812b6e50f63b13b9a6eefb012da83f6283ab
Component: engine
 2017-01-12 18:28:16 +01:00
Vincent Demeester
9122c50dc9 Merge pull request #28500 from rhvgoyal/remove-unused-param 
devmapper: get rid of unused device id argument in unregisterDevice()
Upstream-commit: e880120fe25543f7f45dad5c3f1fcd43cb3acd8b
Component: engine
 2017-01-12 18:02:00 +01:00
Vincent Demeester
eb27b9a5c9 Merge pull request #27928 from erikh/fix-docs 
api/types/client.go: documentation fix for ImageImportSource
Upstream-commit: 1d40e9cb187640f9369d2bef40d7d9d03b03d493
Component: engine
 2017-01-12 17:36:36 +01:00
Yong Tang
7a795dddeb Add test for image size for v1.12 and v1.13 clients against v1.13 daemon 
This test checks to make sure both v1.12 and v1.13 client against v1.13 daemon get correct `Size` after the fix.

This test is related to 30027.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d9451f1c8c8a584053ef06e0801df14e37d43cbd
Component: engine
 2017-01-12 08:12:39 -08:00
Kenfe-Mickael Laventure
07dc948442 Fix ImageSummary.Size value 
The prune PR changed the meaning of the file to mean "space on disk
only unique to this image", this PR revert this change.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: be20dc15af0cb281bd6d11586cfcc96bd50d12ca
Component: engine
 2017-01-12 07:49:22 -08:00
Boaz Shuster
a1c6880e0b Specify in which line the Dockerfile parser failed 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 8f282cdea5186896923da02f420e929c8ded61cb
Component: engine
 2017-01-12 17:45:45 +02:00
Brian Goff
5ce3711251 Merge pull request #30010 from thaJeztah/master-revert-27146 
Revert "Require continuation char to be last char in a line"
Upstream-commit: bf71db7a12c6855720182d02af1a58c0b343468d
Component: engine
 2017-01-12 09:17:08 -05:00
Sebastiaan van Stijn
b003f7cdb4 Merge pull request #30077 from tonistiigi/fix-test-leaks 
Fix leaked connections in integration tests
Upstream-commit: af5323f9583dbce0f6d8a43a2e442400b9e9b981
Component: engine
 2017-01-12 11:35:02 +01:00
John Howard
411f61003c Merge pull request #30085 from swernli/skip_push_base 
storeLayer.Parent should return describableStoreLayers
Upstream-commit: e48937fb9922cbc1a7e2b50eb9d3d6d589a51d02
Component: engine
 2017-01-11 23:37:50 -08:00
Tonis Tiigi
0c76241c26 Close stdout/stderr fifo as soon as possible 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5a6184a535b62d9b5515d18d8561641d3f3d04cb
Component: engine
 2017-01-11 22:11:13 -08:00
Stefan J. Wernli
8d865a6c15 storeLayer.Parent should return describableStoreLayers 
When storeLayer.Parent returns the parent layer, it needs to use the same logic as Get where it wraps in a describablyStoreLayer if the layer is describable. Otherwise, on Windows, this can result in pushing the foreign layers, which is not supposed to be allowed.
This fixes https://github.com/docker/docker/issues/30080.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: d14b7212ad7b2b161afc6f0c9ac08daae14198c0
Component: engine
 2017-01-11 19:01:13 -08:00
Akihiro Suda
5d161f8e0e Merge pull request #30073 from albers/completion-swarm-join--availability 
Add bash completion for `swarm join --availability`
Upstream-commit: d9a4bba398031b6f644985d50265df9b32ce2ae0
Component: engine
 2017-01-12 10:37:02 +09:00
Tibor Vass
4481a136ca Merge pull request #30079 from tonistiigi/debug-trusttest 
Print daemon stacktrace when trust test times out
Upstream-commit: 640a5c1a38b3d6128be27f15e823e7cb2ce7e323
Component: engine
 2017-01-11 17:06:33 -08:00
Tõnis Tiigi
1362fa8de5 Merge pull request #30065 from dnephin/fix-extends-error-message 
Improve the error message for extends in stack deploy.
Upstream-commit: acaf3cf870ff6a88df5c480682046e4106e31da5
Component: engine
 2017-01-11 15:27:01 -08:00
Tonis Tiigi
8618f63e83 Print daemon stacktrace when trust test times out 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e533685d13251e5c7127f2d92636c7fa6393c06e
Component: engine
 2017-01-11 15:14:36 -08:00
Tonis Tiigi
24c4a881f8 Fix leaked connections in integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1e98fb5ad91b956005059ae2148b1dda6fdf372c
Component: engine
 2017-01-11 14:48:48 -08:00
Sebastiaan van Stijn
b8f872e90b Merge pull request #29891 from sanimej/libnvendor 
vendorin libnetwork @f9fa6e0
Upstream-commit: de54284bd7cf4e1c8c255c61d0cf05533f3c2ba4
Component: engine
 2017-01-11 19:55:00 +01:00
Harald Albers
47580bbc58 Add bash completion for swarm join --availability 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f487b268f9ec7e4f06723261dadc2b567bf0504c
Component: engine
 2017-01-11 10:30:56 -08:00
Brian Goff
be1edfea27 Merge pull request #30060 from xulike666/fix-typo 
Fix typo in libcontainerd/client.go
Upstream-commit: c38bb7a72517aec4c695d778c857621778edff82
Component: engine
 2017-01-11 12:13:35 -05:00
Daniel Nephin
b112b94b43 Improve the error message for extends in stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 46422df4900be14730447045cc1b1da3ebbf1e28
Component: engine
 2017-01-11 11:57:24 -05:00
Sebastiaan van Stijn
de94c8e520 Merge pull request #24993 from yongtang/24596-swarm-join-with-drain 
Allow swarm join with `--availability=drain`
Upstream-commit: 66aba12df2319b55b04e381189da39a7f35029e5
Component: engine
 2017-01-11 17:39:01 +01:00