Sebastiaan van Stijn
dcefa0bb91
Don't attempt to remove unsupported resources on older daemon
...
When running `docker stack rm <some stack>` against an older daemon,
a warning was printed for "configs" being ignored;
WARNING: ignoring "configs" (requires API version 1.30, but the Docker daemon API version is 1.26)
Given that an old daemon cannot _have_ configs, there should not be
a need to warn, or _attempt_ to remove these resources.
This patch removes the warning, and skips fetching (and removing)
configs.
A check if _secrets_ are supported by the daemon is also added,
given that this would result in an error when attempted against
an older (pre 1.13) daemon.
There is one situation where this could lead to secrets or
configs being left behind; if the client is connecting to a
daemon that _does_ support secrets, configs, but the API version
is overridden using `DOCKER_API_VERSION`, no warning is printed,
and secrets and configs are not attempted to be removed.
Given that `DOCKER_API_VERSION` is regarded a feature for
debugging / "power users", it should be ok to ignore this.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2429f15672
2017-07-11 10:29:03 -07:00
Victor Vieux
4df758062c
Merge pull request #312 from thaJeztah/remove-unused-prune-functions
...
Remove unused prune functions
Upstream-commit: 6908e58f0f
2017-07-11 12:15:44 +02:00
Victor Vieux
d29a2e376a
Merge pull request #318 from thaJeztah/pin-vndr
...
pin vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
Upstream-commit: b7b680590b
2017-07-11 12:14:59 +02:00
Victor Vieux
2fe1273c48
Merge pull request #321 from albers/remove-completion-service-update--network
...
Remove bash completion for `service update --network`
Upstream-commit: 251eafd637
2017-07-11 12:14:27 +02:00
Harald Albers
97978c93db
Remove bash completion for service update --network
...
The `--network` option is only available for `docker service create`.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e7e77b5e65
2017-07-11 11:20:18 +02:00
Sebastiaan van Stijn
e54b9b8905
pin vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
...
This make updating vndr a deliberate action, and
prevents updates to vndr from making the vendor
validation fail in CI.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 008785f5b5
2017-07-10 14:31:57 -07:00
Sebastiaan van Stijn
740312d66e
Remove unused prune functions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d8a2972cb1
2017-07-10 13:27:19 -07:00
Sebastiaan van Stijn
48a86be4fc
Merge pull request #316 from thaJeztah/revendor-dependencies
...
Revendor dependencies
Upstream-commit: a765218f19
2017-07-10 13:23:17 -07:00
Sebastiaan van Stijn
f217147904
Revendor dependencies
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3e3c9d69d8
2017-07-10 10:56:42 -07:00
Vincent Demeester
e7c8bab937
Merge pull request #298 from dnephin/fix-stack-out-stream
...
Fix stack output stream
Upstream-commit: af6c0896f5
2017-07-10 09:23:23 +02:00
Sebastiaan van Stijn
3578bb4ff2
Merge pull request #259 from aaronlehmann/service-progress-surface-error
...
progress: Show task error in place of progress bar
Upstream-commit: 7ae9bc141c
2017-07-09 00:04:38 -07:00
Sebastiaan van Stijn
b41167fb89
Merge pull request #270 from tych0/warn-only-about-password-on-cli
...
login: print a big warning when using --password
Upstream-commit: c99530b1d2
2017-07-08 16:37:40 -07:00
Aaron Lehmann
89b86f4aaf
Merge pull request #308 from ProgVal/patch-1
...
Fix typo (proceed -> precede)
Upstream-commit: 534c3d285b
2017-07-07 13:45:00 -07:00
Valentin Lorentz
aa221f747d
Fix typo (proceed -> precede)
...
Signed-off-by: Valentin Lorentz <progval+git@progval.net >
Upstream-commit: 4f3a8aecad
2017-07-07 13:17:15 +02:00
Aaron Lehmann
4b7c8d1706
Merge pull request #303 from yastij/fix-SIGSEGV-runContainer
...
fixing SIGSEGV when running containers
Upstream-commit: dfdbdab651
2017-07-06 15:45:38 -07:00
Aaron Lehmann
f002184455
progress: Light refactor
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c9b92a328d
2017-07-06 10:40:35 -07:00
Yassine TIJANI
b0f07c55f2
fixing SIGSEGV when running containers
...
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com >
moving the deffering of the close after the error checking
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com >
fixing SIGSEGV when running containers
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com >
Upstream-commit: 45b0e7cf1a
2017-07-06 18:57:36 +02:00
Vincent Demeester
e249ded12b
Merge pull request #211 from ksouf/issue-37-add-tests-on-commands
...
adding network_create tests
Upstream-commit: 1aa82bc7df
2017-07-06 08:59:15 +02:00
Aaron Lehmann
e839364f20
Merge pull request #296 from thaJeztah/fix-error-overwrite
...
Fix error variable being overwritten
Upstream-commit: e672589ec0
2017-07-05 19:26:27 -07:00
khaled souf
259b5f4251
adding unit tests to network
...
Signed-off-by: khaled souf <khaled.souf@gmail.com >
Upstream-commit: 57c1551991
2017-07-06 00:54:30 +02:00
Sebastiaan van Stijn
a9905bfdd7
Fix error variable being overwritten
...
The `err` variable was set in a loop, so only
the last result was taken into account to return
"failure" or not.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4d4c789cac
2017-07-05 13:54:57 -07:00
Daniel Nephin
2af533daad
Remove duplication in task formatting.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0030bfea9f
2017-07-05 13:40:47 -04:00
Daniel Nephin
6d92cf3a08
Fix stream for 'nothing found in stack' message
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: fb6deb1077
2017-07-05 13:32:54 -04:00
Brian Goff
73e9cd2c31
Merge pull request #286 from thaJeztah/bump-moby
...
Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
Upstream-commit: 30933b516b
2017-07-05 09:38:32 -04:00
Sebastiaan van Stijn
9c9fdfadf7
update tests for new image struct
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e8080dd7e5
2017-07-04 20:34:24 -07:00
Sebastiaan van Stijn
542cf421f5
Bump moby to 87df0e533b619c088091fd1e2310e92bb9a24822
...
Includes changes from;
- Add a LastTagTime for images (https://github.com/moby/moby/pull/31497 )
- Fix handling of remote "git@" notation (https://github.com/moby/moby/pull/33696 )
- Move some `api` package functions away (https://github.com/moby/moby/pull/33798 ) (related to https://github.com/docker/cli/pull/236 )
- Set ping version even on error (https://github.com/moby/moby/pull/33827 )
- Do not add duplicate platform information to service spec (https://github.com/moby/moby/pull/33867 )
- Refactor MountPoint Setup function in volume.go (https://github.com/moby/moby/pull/33890 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 366d3ec971
2017-07-04 20:23:38 -07:00
Vincent Demeester
36ea5491ac
Merge pull request #287 from thaJeztah/use-v1.0.0-tag-for-go-difflib
...
Use v1.0.0 tag for go-difflib
Upstream-commit: dc9feff879
2017-07-04 17:32:00 +02:00
Daniel Nephin
2a3613893d
Merge pull request #276 from adshmh/add-unit-tests-to-checkpoint-package
...
add unit tests to checkpoint package
Upstream-commit: 3554d02f33
2017-07-04 11:17:25 -04:00
Vincent Demeester
9fdb37ee64
Merge pull request #288 from thaJeztah/bump-go-winio
...
Bump go-winio to 0.4.2
Upstream-commit: e08cb59c8a
2017-07-04 16:59:32 +02:00
Victor Vieux
5305c7b28b
Merge pull request #248 from albers/completion-network-create--scope
...
Add bash completion for `network create --scope|--config-only|config-from`
Upstream-commit: 306212574a
2017-07-04 16:48:18 +02:00
Victor Vieux
58665dca40
Merge pull request #246 from albers/completion-prune--filter-label
...
Add bash completion for `label` filter of `prune` commands
Upstream-commit: 1f45f1b5f9
2017-07-04 16:44:23 +02:00
Victor Vieux
4f68746145
Merge pull request #282 from albers/completion-daemon-updates
...
Updates to bash completion for `dockerd`
Upstream-commit: 42a31ff8c1
2017-07-04 16:42:10 +02:00
Victor Vieux
e562168436
Merge pull request #285 from albers/completion-overlay2.size
...
Add bash completion for `dockerd --storage-opt overlay2.size`
Upstream-commit: d47bbb8358
2017-07-04 16:41:35 +02:00
Victor Vieux
d2b6d249be
Merge pull request #243 from vieux/scale2
...
add `--detach` to docker scale
Upstream-commit: 43fb4a4547
2017-07-04 16:36:59 +02:00
Harald Albers
460a63fa01
Add bash completion for dockerd --metrics-addr
...
`--metrics-addr` does not accept network interface names.
Therefore `__docker_local_interfaces` was refined for this feature to
optionally exclude interface names.
Note that although `--metrics-addr` is experimental, it cannot be
selectively enabled in bash completion because the test for the daemon
running in experimental mode requires a running daemon. As this
completion pertains to starting the daemon, this requirement is not met.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0ea31afd57
2017-07-04 14:40:22 +02:00
Vincent Demeester
f186d3c42f
Merge pull request #289 from mstanleyjones/multiple-env
...
Provide examples for multiple uses of the same flag
Upstream-commit: 357ff50fa9
2017-07-04 12:48:20 +02:00
Sebastiaan van Stijn
72c6de1018
Merge pull request #292 from thaJeztah/clarify-docker-go-package
...
Clarify docker/go package
Upstream-commit: 8df4cd1edc
2017-07-03 23:44:26 -07:00
Sebastiaan van Stijn
e194cd1eb4
Merge pull request #290 from mstanleyjones/d-and-rm-flags
...
Clarify that you can use -d and --rm together now
Upstream-commit: 98b7dbe908
2017-07-03 23:43:36 -07:00
Sebastiaan van Stijn
e415e09501
Clarify docker/go package
...
This package is used by Notary. Add a comment to
the vendor.conf file to explain what it contains
and what it's used for.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60fe70c900
2017-07-03 18:00:46 -07:00
Misty Stanley-Jones
9e2f4854f6
Clarify that you can use -d and --rm together now
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: c63485b47d
2017-07-03 16:43:41 -07:00
Misty Stanley-Jones
017354f791
Provide examples for multiple uses of the same flag
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ef61582591
2017-07-03 16:21:28 -07:00
Sebastiaan van Stijn
ca1a24c1df
Bump go-winio to 0.4.2
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8a3c89b409
2017-07-03 14:37:56 -07:00
Sebastiaan van Stijn
d7aea54f11
Use v1.0.0 tag for go-difflib
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 42d83d20c9
2017-07-03 11:42:28 -07:00
Harald Albers
dff3d848de
Add bash completion for dockerd --storage-opt overlay2.size
...
This adds bash completion for
- https://github.com/docker/cli/pull/215
- https://github.com/moby/moby/pull/32977
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a4b1769bb6
2017-07-03 18:03:00 +02:00
Vincent Demeester
c914e1a6cd
Merge pull request #213 from dnephin/improve-swarm-ca-cmd
...
Refactor and UI changes to `swarm ca` command
Upstream-commit: 85b41c3e71
2017-07-03 17:02:45 +02:00
Tycho Andersen
f4b9a413f3
login: print a big warning when using --password
...
Task command lines are world readable via /proc/pid/cmdline, so this isn't
safe.
Signed-off-by: Tycho Andersen <tycho@tycho.ws >
Upstream-commit: c269ad26e8
2017-07-03 08:47:20 -06:00
Harald Albers
3abe1e3a95
Add bash completion for dockerd --cpu-rt-(period|runtime)
...
This adds bash completion for https://github.com/moby/moby/pull/23430 .
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 74a5d1af86
2017-07-03 13:55:46 +02:00
Harald Albers
67ccad49a6
Add bash completion for dockerd --default-runtime
...
`--default-runtime` was added in https://github.com/moby/moby/pull/22983
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d610951e85
2017-07-03 13:44:23 +02:00
Victor Vieux
0b37ceed6f
scale all services at once
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 58d3fc24b1
2017-07-03 13:40:54 +02:00
Harald Albers
523bbfaf9d
Add bash completion for dockerd --no-new-privileges
...
This adds bash completion for https://github.com/moby/moby/pull/32944 .
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 112348d4db
2017-07-03 13:33:01 +02:00
