6143a4613a
Include whether the managers in the swarm are autolocked as part of docker info.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 3428b78e96
2017-08-25 16:33:46 -07:00
7313d24a20
Merge pull request #445 from dnephin/add-end-to-end-suite
...
Add end to end suite
Upstream-commit: 6c3d93bbb6
2017-08-23 16:16:09 -07:00
881ab6b17f
Remove bash completion for stack ps --all|-a
...
This option was removed in https://github.com/moby/moby/pull/28885 .
Bash completion was only updated for `service ps`, though.
See https://github.com/moby/moby/pull/29716 for the corresponding docs
change.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 328f4fbf06
2017-08-23 13:34:23 +02:00
e11d0e6967
Merge pull request #440 from ripcurld0/search_format
...
Add --format to docker-search
Upstream-commit: 05308fcec7
2017-08-22 19:10:53 -04:00
19e250d57c
Merge pull request #456 from dnephin/add-tests-for-client
...
Add unit tests for initializing the client
Upstream-commit: 5e1d0289f4
2017-08-22 16:08:36 -07:00
93c266f248
Add --format to docker-search
...
Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com >
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 88cc47ad5c
2017-08-23 01:37:54 +03:00
b8932dcdf4
Merge pull request #463 from dnephin/remove-pkg-testutil
...
Remove docker/docker/pkg/testutil
Upstream-commit: 79ecfa876b
2017-08-22 13:53:03 -04:00
cd24988c20
support --compose-file - as stdin
...
Signed-off-by: Marco Mariani <marco.mariani@alterway.fr >
Upstream-commit: 3a0b967c05
2017-08-22 17:55:59 +02:00
ba672661c5
Merge pull request #439 from ripcurld0/fix_image_ls_digest
...
Show images digests when "{{.Digest}}" is in format
Upstream-commit: 317b735573
2017-08-22 16:17:43 +02:00
01f2e768d7
Use new internal testutil.ErrorContains()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 846a31aa50
2017-08-22 10:14:25 -04:00
b141cbce57
Move internal/test package out of cli.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b3f843afe2
2017-08-22 10:14:25 -04:00
0b20e1c511
Show images digests when "{{.Digest}}" is in format
...
This patch fixes the following bug:
Running "docker image ls --digests" will add images digests
to the image table. However, when using "format" to display
images digests all of them are "<none>".
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 83112f6343
2017-08-22 16:55:10 +03:00
243671339d
Merge pull request #386 from thaJeztah/fix-image-resolve-detection
...
Fix image resolve detection
Upstream-commit: 8da1daeefa
2017-08-22 15:05:39 +02:00
34feb17aa0
Merge pull request #460 from krizalys/hyphenless-bind-mount
...
Dropped hyphen in bind mount where appropriate
Upstream-commit: fa986e8039
2017-08-21 20:29:27 +02:00
4d8217810d
Merge pull request #461 from jphuynh/zsh-service-rollback
...
Add zsh completion for `service rollback`
Upstream-commit: 387cbcebb7
2017-08-21 13:29:01 -04:00
9724d4044a
Add bash completion for service rollback
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d1ed800860
2017-08-21 14:50:46 +02:00
53a6b2ff69
Add zsh completion for service rollback
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr >
Upstream-commit: 8929c49c3a
2017-08-20 20:37:27 +01:00
31162a9a25
Dropped hyphen in bind mount where appropriate
...
Signed-off-by: Christophe Vidal <kriss@krizalys.com >
Upstream-commit: 037029414d
2017-08-19 21:14:48 +07:00
43172bf261
Merge pull request #205 from redpanda/rollback
...
Add 'docker service rollback' subcommand
Upstream-commit: 3c7ede6a68
2017-08-19 15:56:14 +02:00
2e782847eb
Add unit tests for initializing the client.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 930f97dd09
2017-08-18 12:49:23 -04:00
6092fc343f
Update schemas to prevent invalid properties in deploy.resources
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 1667073908
2017-08-17 15:58:51 -07:00
04e18204b0
Merge pull request #449 from dnephin/use-gotestyourself
...
Remove dependency on (most of) docker/docker/pkg/testutil
Upstream-commit: e57842edb8
2017-08-17 12:37:18 -07:00
7048b7f056
Fix typo and minor Markdown edits
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9544b70cb3
2017-08-17 02:29:24 +02:00
0d15a1c160
Fix "liquid" warning on logging plugins page
...
Noticed this warning in the documentation CI:
Liquid Warning: Liquid syntax error (line 210): Expected end_of_string but found id in "{{ log stream }}" in engine/extend/plugins_logging.md
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d30987f85f
2017-08-17 00:56:54 +02:00
cded911aad
Add 'docker service rollback' subcommand
...
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Implement runRollback to not use runUpdate
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Add version tag and add flag quiet to suppress progress output
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Removed flags from warnDetachDefault
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Used command.Cli interface
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Add detach flag on rollback command
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Create a fakeClient for service commands
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Added unit test for rollback command
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Used command.Cli interface instead of *command.DockerCli in service commands
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Revert "Removed flags from warnDetachDefault"
This reverts commit 3e4f601c8a82cc2599a755dc693409bbc47917fc.
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Fixed test.NewFakeCli instanciation
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Removed unused receiver
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Replaced cli by dockerCli
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Revert "Removed unused receiver"
This reverts commit 604ef7c13df3d019949ca81d992db501114dafce.
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Fixed last typo
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com >
Upstream-commit: 11d471d660
2017-08-16 22:18:36 +02:00
55bd0229fa
Replace pkg/testutil/tempfile with gotestyourself/fs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 15837afa77
2017-08-16 14:23:28 -04:00
34fe016d0d
Update volume command tests to use the new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 505a0fe45f
2017-08-16 14:23:28 -04:00
a5b8c46809
Update swarm command tests to use the new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3d68aa8416
2017-08-16 14:23:28 -04:00
38bd6cfe47
Update stack and task command tests to new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1dd742eac8
2017-08-16 14:23:28 -04:00
2c6a1a2476
Update service and secret command tests to new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4c62d7288f
2017-08-16 14:23:28 -04:00
79c79c9b8f
Update node command tests to the new golden
...
Also remove some superfluous tests that are now covered by a strict golden.Assert
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0e2bf7420a
2017-08-16 14:23:15 -04:00
c06d7f05e3
Update image command tests to use the new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 75f7bfedf8
2017-08-16 14:20:36 -04:00
5a6dec9ec1
Update config and checkpoint commands to use gotestyourself/golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f9007ad7db
2017-08-16 14:19:00 -04:00
3b7026d84c
Add gotestyourself dependency.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 882992c6fc
2017-08-16 14:08:08 -04:00
457a3de5d9
Updated & reformulated kinds of mounts section
...
Signed-off-by: Christophe Vidal <kriss@krizalys.com >
Upstream-commit: 9c4b9c6f63
2017-08-17 00:51:35 +07:00
847cb8e0df
Add a Jenkinsfile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 63d76065bb
2017-08-16 10:46:43 -04:00
66fb82e7e8
Add first e2e test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b5cb5ee446
2017-08-16 10:46:40 -04:00
581aa22bc8
Add scripts for setting up e2e test environment.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 26418a12fb
2017-08-16 10:35:56 -04:00
53ea16fce8
Add gotestyourself dependency.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 85f7ed8cfa
2017-08-16 10:35:56 -04:00
8ae99115c1
Merge pull request #443 from dnephin/ignore-codecov-upload-fail
...
Ignore codecov upload failures in CI
Upstream-commit: 35c60bbd9b
2017-08-15 13:05:43 -07:00
b4e14f104b
Set DISABLE_WARN_OUTSIDE_CONTAINER in the Dockerfile so that we don't spend 10s sleeping in CI
...
also add time to validate check
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 058733969c
2017-08-15 14:34:43 -04:00
750260f43f
Ignore codecov upload failures in CI.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e09dba068
2017-08-15 14:34:43 -04:00
850fb084cc
Merge pull request #430 from dnephin/add-build-target-to-compose
...
Add network and target to build in v3.4
Upstream-commit: 04659b8802
2017-08-15 19:20:49 +02:00
e3f190dc00
Ignore codecov upload failures in CI.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6a7dc459dd
2017-08-15 13:17:20 -04:00
a3ff59d2d3
Merge pull request #354 from dnephin/warn-outside-container
...
Add a warning when make is run outside of a container
Upstream-commit: 703a7cca2b
2017-08-14 14:10:12 -04:00
133a5fd166
Merge pull request #436 from thaJeztah/improve-singular-plural-message
...
Singularize / pluralize "argument(s)" in error message
Upstream-commit: 3b8cf20a0c
2017-08-14 11:06:25 -04:00
2d6cf733e9
Merge pull request #438 from ripcurld0/history_fix
...
Print timestamp when --human=true
Upstream-commit: 898f1e2997
2017-08-14 16:02:04 +02:00
e79a815f73
Merge pull request #432 from lukahartwig/docs-add-docker-events-examples
...
Added docker events example with until option to documentation
Upstream-commit: b8d325efd5
2017-08-14 10:57:46 +02:00
5f265aadb9
Merge pull request #349 from jphuynh/shellcheck-scripts
...
Add scripts folder to shellcheck
Upstream-commit: 53d8886f9c
2017-08-14 10:26:45 +02:00
26d7f26c3b
Merge pull request #434 from bryfry/patch-1
...
Documentation: Make the example match the documentation table
Upstream-commit: 7ceb25f895
2017-08-14 10:25:20 +02:00
