a0113c3a44
updated vendoring
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-09-01 19:41:06 -04:00
d861a1c3dd
Merge pull request #485 from seemethere/re_add_test_target
...
Re-adds test target to the Makefile
2017-08-31 17:50:14 -07:00
d817967647
Merge pull request #489 from dnephin/fix-container-run
...
Fix crash in container run after pulling an image
2017-08-31 18:11:26 -04:00
5a9bf7f359
Merge pull request #484 from ripcurld0/ps_exit_1
...
When nothing found in stack exit with exit code 1
2017-08-31 17:13:00 -04:00
a0d8d80250
Fix crash in containe run after pulling an image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-31 17:08:02 -04:00
d53c8de06b
Re-adds test target to the Makefile
...
The test target existed before, this is to provide a legacy interface to
allow easy testing for downstream Docker CE.
Without this we would need separate Makefiles/Jenkinsfiles for releases
past 17.07. Later on this target could also be used to test both unit
tests and integration tests at the same time.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-31 10:32:00 -07:00
79f9af2475
When nothing found in stack exit with exit code 1
...
To keep on a consistent behaviour such as in docker-service-ps
if docker-stack-ps didn't find a given stack, the command line
should exit with exit code 1.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-08-30 23:25:36 +03:00
e636a5388c
Merge pull request #475 from AliyunContainerService/start_period
...
Support start_period for healthcheck in Docker Compose
2017-08-30 14:11:43 -04:00
8ea02f6f08
Merge pull request #477 from dnephin/some-tests-for-container-command
...
A few tests for container command
2017-08-30 09:38:38 -07:00
e02fcfd34e
Change the type of interval, timeout and start_period of healthcheck from string to * time.Duration
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2017-08-30 23:39:12 +08:00
65202d669a
Merge pull request #482 from dnephin/add-ulimit-to-unsupported
...
Add ulimits to unsupported compose fields
2017-08-29 19:26:36 -04:00
e7f90b6b38
Reduce complexity in cli/command/container
...
Add tests for exec and cleanup existing tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 19:25:50 -04:00
bdc8cf364e
Add ulimits to unsupported compose fields.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 17:05:16 -04:00
e6006219ab
Merge pull request #480 from dnephin/remove-unnecessary-deps
...
Remove 5k lines of unnecessary dependencies
2017-08-29 10:37:43 -07:00
8edd2dd3df
Remove unused vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 13:22:17 -04:00
dae1b7112c
Remove test for code not in this repo.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 13:19:28 -04:00
6780c29d6e
Merge pull request #476 from dnephin/small-cleanup-to-two-formatters
...
Reduce complexity of image formatter
2017-08-29 12:04:43 -04:00
0abdad615f
Support start_period for healthcheck in Docker Compose
...
Signed-off-by: Li Yi <denverdino@gmail.com>
2017-08-29 11:19:29 +08:00
d318c4112b
Reduce complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-28 12:49:07 -04:00
7e52344cd2
Merge pull request #471 from cyli/surface-autolock
...
Include whether the managers in the swarm are autolocked as part of `docker info`
2017-08-28 17:46:09 +02:00
3428b78e96
Include whether the managers in the swarm are autolocked as part of `docker info`.
...
Signed-off-by: Ying Li <ying.li@docker.com>
2017-08-25 16:33:46 -07:00
21b5bbe411
Merge pull request #454 from mstanleyjones/resource-updating-windows
...
docker update does not work on Windows containers
2017-08-25 19:57:12 +02:00
047d3c23a7
docker update does not work on Windows containers
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-08-25 10:35:28 -07:00
d83752cdf2
Merge pull request #452 from dnephin/compose-allow-x-fields
...
Allow extension fields in the v3.4 version of the compose format
2017-08-25 12:37:47 -04:00
cfb228b963
Merge pull request #469 from dnephin/add-testing-doc
...
Add testing guidelines document
2017-08-25 12:35:16 -04:00
8ebc03a71f
Merge pull request #367 from kolyshkin/ipcmode
...
Introduce/document new IPC modes
2017-08-25 09:48:00 +02:00
1086e84718
Merge pull request #468 from rubensfig/34373-docker-doc
...
Added docker documentation for Expose
2017-08-25 09:07:16 +02:00
ffed6f5ff9
Add TESTING document.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-24 14:45:50 -04:00
6c3d93bbb6
Merge pull request #445 from dnephin/add-end-to-end-suite
...
Add end to end suite
2017-08-23 16:16:09 -07:00
dd95731a21
Added docker documentation for Expose
...
Signed-off-by: Rubens Figueiredo <r.figueiredo.52@gmail.com>
2017-08-23 16:12:46 -07:00
f5a192bcc4
Merge pull request #466 from albers/completion-remove-stack-ps--all
...
Remove bash completion for `stack ps --all|-a`
2017-08-23 09:57:29 -04:00
328f4fbf06
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>
2017-08-23 13:34:23 +02:00
05308fcec7
Merge pull request #440 from ripcurld0/search_format
...
Add --format to docker-search
2017-08-22 19:10:53 -04:00
5e1d0289f4
Merge pull request #456 from dnephin/add-tests-for-client
...
Add unit tests for initializing the client
2017-08-22 16:08:36 -07:00
88cc47ad5c
Add --format to docker-search
...
Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com>
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-08-23 01:37:54 +03:00
79ecfa876b
Merge pull request #463 from dnephin/remove-pkg-testutil
...
Remove docker/docker/pkg/testutil
2017-08-22 13:53:03 -04:00
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
Simon Ferquel
Victor Vieux
Daniel Nephin
Daniel Nephin
Eli Uriegas
Boaz Shuster
Li Yi
Tibor Vass
Li Yi
Vincent Demeester
Ying Li
Misty Stanley-Jones
Rubens Figueiredo
Harald Albers
Marco Mariani
Jean-Pierre Huynh
Christophe Vidal