fdee4e99e9
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 >
Upstream-commit: d53c8de06b
2017-08-31 10:32:00 -07:00
8bf4dec055
Merge pull request #475 from AliyunContainerService/start_period
...
Support start_period for healthcheck in Docker Compose
Upstream-commit: e636a5388c
2017-08-30 14:11:43 -04:00
8be8bd8ae1
Merge pull request #477 from dnephin/some-tests-for-container-command
...
A few tests for container command
Upstream-commit: 8ea02f6f08
2017-08-30 09:38:38 -07:00
73cf62aaae
Change the type of interval, timeout and start_period of healthcheck from string to * time.Duration
...
Signed-off-by: Li Yi <denverdino@gmail.com >
Upstream-commit: e02fcfd34e
2017-08-30 23:39:12 +08:00
44d38eb2ce
Merge pull request #482 from dnephin/add-ulimit-to-unsupported
...
Add ulimits to unsupported compose fields
Upstream-commit: 65202d669a
2017-08-29 19:26:36 -04:00
811eac4392
Reduce complexity in cli/command/container
...
Add tests for exec and cleanup existing tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7f90b6b38
2017-08-29 19:25:50 -04:00
853b31143d
Add ulimits to unsupported compose fields.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bdc8cf364e
2017-08-29 17:05:16 -04:00
a174528496
Merge pull request #480 from dnephin/remove-unnecessary-deps
...
Remove 5k lines of unnecessary dependencies
Upstream-commit: e6006219ab
2017-08-29 10:37:43 -07:00
4ac950c1d0
Remove unused vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8edd2dd3df
2017-08-29 13:22:17 -04:00
ee93512169
Remove test for code not in this repo.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dae1b7112c
2017-08-29 13:19:28 -04:00
b55202146c
Merge pull request #476 from dnephin/small-cleanup-to-two-formatters
...
Reduce complexity of image formatter
Upstream-commit: 6780c29d6e
2017-08-29 12:04:43 -04:00
a4cd4da158
Support start_period for healthcheck in Docker Compose
...
Signed-off-by: Li Yi <denverdino@gmail.com >
Upstream-commit: 0abdad615f
2017-08-29 11:19:29 +08:00
83dbde2057
Reduce complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d318c4112b
2017-08-28 12:49:07 -04:00
7ae4b76cda
Merge pull request #471 from cyli/surface-autolock
...
Include whether the managers in the swarm are autolocked as part of `docker info`
Upstream-commit: 7e52344cd2
2017-08-28 17:46:09 +02:00
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
de5380dba8
Merge pull request #454 from mstanleyjones/resource-updating-windows
...
docker update does not work on Windows containers
Upstream-commit: 21b5bbe411
2017-08-25 19:57:12 +02:00
2d72ab2282
docker update does not work on Windows containers
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 047d3c23a7
2017-08-25 10:35:28 -07:00
0458d1b8d1
Merge pull request #452 from dnephin/compose-allow-x-fields
...
Allow extension fields in the v3.4 version of the compose format
Upstream-commit: d83752cdf2
2017-08-25 12:37:47 -04:00
9e09dbbb1a
Merge pull request #469 from dnephin/add-testing-doc
...
Add testing guidelines document
Upstream-commit: cfb228b963
2017-08-25 12:35:16 -04:00
3b7e9c65c0
Merge pull request #367 from kolyshkin/ipcmode
...
Introduce/document new IPC modes
Upstream-commit: 8ebc03a71f
2017-08-25 09:48:00 +02:00
939356770a
Merge pull request #468 from rubensfig/34373-docker-doc
...
Added docker documentation for Expose
Upstream-commit: 1086e84718
2017-08-25 09:07:16 +02:00
3104a37598
Add TESTING document.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ffed6f5ff9
2017-08-24 14:45:50 -04: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
1d2c919b02
Added docker documentation for Expose
...
Signed-off-by: Rubens Figueiredo <r.figueiredo.52@gmail.com >
Upstream-commit: dd95731a21
2017-08-23 16:12:46 -07:00
d63b05f093
Merge pull request #466 from albers/completion-remove-stack-ps--all
...
Remove bash completion for `stack ps --all|-a`
Upstream-commit: f5a192bcc4
2017-08-23 09:57:29 -04: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
7a59959943
Merge pull request #347 from Wolphin-project/stdin
...
support --compose-file - as stdin
Upstream-commit: 0d17ea2577
2017-08-22 13:37:22 -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
f71ceb67bc
Allow extension fields in the v3.4 version of the compose format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2a1857e899
2017-08-22 10:42:49 -04: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
622dcc2576
Merge pull request #462 from albers/completion-service-rollback
...
Add bash completion for `service rollback`
Upstream-commit: 77faf03727
2017-08-21 10:25:03 -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
3f532263bf
Merge pull request #455 from shin-/prevent_invalid_resources
...
Update schemas to prevent invalid properties in deploy.resources
Upstream-commit: a8a3ffa8ef
2017-08-18 11:42:39 -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
a6a08902d2
Merge pull request #448 from thaJeztah/fix-typo
...
Fix typo and minor Markdown edits
Upstream-commit: 070d0811e3
2017-08-17 19:59:55 +02:00
