0d17ea2577
Merge pull request #347 from Wolphin-project/stdin
...
support --compose-file - as stdin
2017-08-22 13:37:22 -04:00
3a0b967c05
support --compose-file - as stdin
...
Signed-off-by: Marco Mariani <marco.mariani@alterway.fr>
2017-08-22 17:55:59 +02:00
2a1857e899
Allow extension fields in the v3.4 version of the compose format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-22 10:42:49 -04:00
317b735573
Merge pull request #439 from ripcurld0/fix_image_ls_digest
...
Show images digests when "{{.Digest}}" is in format
2017-08-22 16:17:43 +02:00
846a31aa50
Use new internal testutil.ErrorContains()
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-22 10:14:25 -04:00
b3f843afe2
Move internal/test package out of cli.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-22 10:14:25 -04:00
83112f6343
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>
2017-08-22 16:55:10 +03:00
8da1daeefa
Merge pull request #386 from thaJeztah/fix-image-resolve-detection
...
Fix image resolve detection
2017-08-22 15:05:39 +02:00
fa986e8039
Merge pull request #460 from krizalys/hyphenless-bind-mount
...
Dropped hyphen in bind mount where appropriate
2017-08-21 20:29:27 +02:00
387cbcebb7
Merge pull request #461 from jphuynh/zsh-service-rollback
...
Add zsh completion for `service rollback`
2017-08-21 13:29:01 -04:00
77faf03727
Merge pull request #462 from albers/completion-service-rollback
...
Add bash completion for `service rollback`
2017-08-21 10:25:03 -04:00
d1ed800860
Add bash completion for `service rollback`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-08-21 14:50:46 +02:00
8929c49c3a
Add zsh completion for `service rollback`
...
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
2017-08-20 20:37:27 +01:00
037029414d
Dropped hyphen in bind mount where appropriate
...
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
2017-08-19 21:14:48 +07:00
3c7ede6a68
Merge pull request #205 from redpanda/rollback
...
Add 'docker service rollback' subcommand
2017-08-19 15:56:14 +02:00
930f97dd09
Add unit tests for initializing the client.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-18 12:49:23 -04:00
a8a3ffa8ef
Merge pull request #455 from shin-/prevent_invalid_resources
...
Update schemas to prevent invalid properties in deploy.resources
2017-08-18 11:42:39 -04:00
1667073908
Update schemas to prevent invalid properties in deploy.resources
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-17 15:58:51 -07:00
e57842edb8
Merge pull request #449 from dnephin/use-gotestyourself
...
Remove dependency on (most of) docker/docker/pkg/testutil
2017-08-17 12:37:18 -07:00
070d0811e3
Merge pull request #448 from thaJeztah/fix-typo
...
Fix typo and minor Markdown edits
2017-08-17 19:59:55 +02:00
9544b70cb3
Fix typo and minor Markdown edits
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-17 02:29:24 +02:00
799de1dae2
Merge pull request #447 from thaJeztah/fix-liquid-warning
...
Fix "liquid" warning on logging plugins page
2017-08-17 02:27:34 +02:00
d30987f85f
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>
2017-08-17 00:56:54 +02:00
3e831e4472
Merge pull request #446 from krizalys/fix-grammar
...
Fixed grammar
2017-08-16 23:20:31 +02:00
11d471d660
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>
2017-08-16 22:18:36 +02:00
15837afa77
Replace pkg/testutil/tempfile with gotestyourself/fs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
505a0fe45f
Update volume command tests to use the new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
3d68aa8416
Update swarm command tests to use the new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
1dd742eac8
Update stack and task command tests to new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
4c62d7288f
Update service and secret command tests to new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:23:28 -04:00
0e2bf7420a
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>
2017-08-16 14:23:15 -04:00
75f7bfedf8
Update image command tests to use the new golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:20:36 -04:00
f9007ad7db
Update config and checkpoint commands to use gotestyourself/golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:19:00 -04:00
882992c6fc
Add gotestyourself dependency.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 14:08:08 -04:00
9c4b9c6f63
Updated & reformulated kinds of mounts section
...
Signed-off-by: Christophe Vidal <kriss@krizalys.com>
2017-08-17 00:51:35 +07:00
63d76065bb
Add a Jenkinsfile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 10:46:43 -04:00
b5cb5ee446
Add first e2e test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 10:46:40 -04:00
26418a12fb
Add scripts for setting up e2e test environment.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 10:35:56 -04:00
85f7ed8cfa
Add gotestyourself dependency.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-16 10:35:56 -04:00
17adcbdada
Merge pull request #444 from dnephin/faster-validate-ci
...
Don't sleep in CI
2017-08-16 13:45:44 +02:00
35c60bbd9b
Merge pull request #443 from dnephin/ignore-codecov-upload-fail
...
Ignore codecov upload failures in CI
2017-08-15 13:05:43 -07:00
058733969c
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>
2017-08-15 14:34:43 -04:00
4e09dba068
Ignore codecov upload failures in CI.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-15 14:34:43 -04:00
04659b8802
Merge pull request #430 from dnephin/add-build-target-to-compose
...
Add network and target to build in v3.4
2017-08-15 19:20:49 +02:00
c848f9acb6
Docs for Windows daemon graphdriver options
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-08-15 10:20:15 -07:00
6a7dc459dd
Ignore codecov upload failures in CI.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-15 13:17:20 -04:00
703a7cca2b
Merge pull request #354 from dnephin/warn-outside-container
...
Add a warning when make is run outside of a container
2017-08-14 14:10:12 -04:00
3b8cf20a0c
Merge pull request #436 from thaJeztah/improve-singular-plural-message
...
Singularize / pluralize "argument(s)" in error message
2017-08-14 11:06:25 -04:00
898f1e2997
Merge pull request #438 from ripcurld0/history_fix
...
Print timestamp when --human=true
2017-08-14 16:02:04 +02:00
b8d325efd5
Merge pull request #432 from lukahartwig/docs-add-docker-events-examples
...
Added docker events example with until option to documentation
2017-08-14 10:57:46 +02:00
Daniel Nephin
Marco Mariani
Daniel Nephin
Vincent Demeester
Boaz Shuster
Harald Albers
Jean-Pierre Huynh
Christophe Vidal
Sebastiaan van Stijn
Joffrey F
Tibor Vass
Sebastiaan van Stijn
Jimmy Leger
John Howard