docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
4,495 Commits 12 Branches 297 Tags
b363a8f8a77a33eeff3bd33de144a54c007f7639
Commit Graph

4408 Commits

Author SHA1 Message Date
pnagy
b363a8f8a7 sort secrets and configs to ensure idempotence 
`docker stack deploy` keeps restarting services it doesn't need to (no changes)
because the entries' order gets randomized at some previous (de)serialization.
Maybe it would be worth looking into this at a higher level and ensure
all (de)serialization happens in an ordered collection.

This quick fix sorts secrets and configs (in place, mutably) which ensures the
same order for each run.

Based on
https://github.com/moby/moby/pull/30506

Fixes
https://github.com/moby/moby/issues/34746

Signed-off-by: Peter Nagy <xificurC@gmail.com>
Upstream-commit: 27e8bdf32b
Component: cli
 2017-09-08 16:09:48 +02:00
Misty Stanley-Jones
74473d87d6 Merge pull request #493 from jmaitrehenry/patch-1 
Change sshfs by cloudstor on Installing and using a plugin
Upstream-commit: af94015b8c
Component: cli
 2017-09-06 14:42:34 -07:00
Daniel Nephin
33d6fdcfda Merge pull request #353 from albers/completion-nodelist 
Use native formatting in bash completion of nodes
Upstream-commit: 0426ea1443
Component: cli
 2017-09-05 15:09:00 -04:00
Daniel Nephin
28cf6767d3 Merge pull request #424 from simonferquel/update-vendoring 
updated vendoring
Upstream-commit: 5c5cdd0e36
Component: cli
 2017-09-05 15:06:09 -04:00
Daniel Nephin
e76adc6a0e Merge pull request #406 from ksouf/issue_37_network_list_test 
adding network list test
Upstream-commit: ec99774a85
Component: cli
 2017-09-05 11:24:32 -04:00
Daniel Nephin
444c2e65a4 Remove unused depdendencies from vendor 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 724f03bb23
Component: cli
 2017-09-01 19:41:06 -04:00
Simon Ferquel
4bafd44516 updated vendoring 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
Upstream-commit: a0113c3a44
Component: cli
 2017-09-01 19:41:06 -04:00
French Ben
ee07288be3 Move output of stack rm to stdout 
Signed-off-by: French Ben <frenchben@docker.com>

Update for the test to capture the proper removal

Signed-off-by: French Ben <frenchben@docker.com>

Satisfy lint length limit

Signed-off-by: French Ben <frenchben@docker.com>

Updated e2e test

Signed-off-by: French Ben <frenchben@docker.com>
Upstream-commit: bb8f49773c
Component: cli
 2017-09-01 14:25:20 -07:00
Julien Maitrehenry
d99a5ff6bf Change sshfs by cloudstor on Installing and using a plugin 
Signed-off-by: Julien Maitrehenry <julien.maitrehenry@me.com>
Upstream-commit: e97d72334f
Component: cli
 2017-09-01 14:42:01 -04:00
Victor Vieux
f119dacce1 Merge pull request #485 from seemethere/re_add_test_target 
Re-adds test target to the Makefile
Upstream-commit: d861a1c3dd
Component: cli
 2017-08-31 17:50:14 -07:00
Daniel Nephin
d48b9a840a Merge pull request #489 from dnephin/fix-container-run 
Fix crash in container run after pulling an image
Upstream-commit: d817967647
Component: cli
 2017-08-31 18:11:26 -04:00
Daniel Nephin
5ed8076112 Merge pull request #484 from ripcurld0/ps_exit_1 
When nothing found in stack exit with exit code 1
Upstream-commit: 5a9bf7f359
Component: cli
 2017-08-31 17:13:00 -04:00
Daniel Nephin
264557313d Fix crash in containe run after pulling an image. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a0d8d80250
Component: cli
 2017-08-31 17:08:02 -04:00
Eli Uriegas
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
Component: cli
 2017-08-31 10:32:00 -07:00
Boaz Shuster
384ceb07e9 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>
Upstream-commit: 79f9af2475
Component: cli
 2017-08-30 23:25:36 +03:00
Daniel Nephin
8bf4dec055 Merge pull request #475 from AliyunContainerService/start_period 
Support start_period for healthcheck in Docker Compose
Upstream-commit: e636a5388c
Component: cli
 2017-08-30 14:11:43 -04:00
Victor Vieux
8be8bd8ae1 Merge pull request #477 from dnephin/some-tests-for-container-command 
A few tests for container command
Upstream-commit: 8ea02f6f08
Component: cli
 2017-08-30 09:38:38 -07:00
Li Yi
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
Component: cli
 2017-08-30 23:39:12 +08:00
Daniel Nephin
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
Component: cli
 2017-08-29 19:25:50 -04:00
Daniel Nephin
853b31143d Add ulimits to unsupported compose fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bdc8cf364e
Component: cli
 2017-08-29 17:05:16 -04:00
Daniel Nephin
4ac950c1d0 Remove unused vendor. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8edd2dd3df
Component: cli
 2017-08-29 13:22:17 -04:00
Daniel Nephin
ee93512169 Remove test for code not in this repo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dae1b7112c
Component: cli
 2017-08-29 13:19:28 -04:00
khaled souf
6eb6b7d9d2 adding network list test 
Signed-off-by: khaled souf <khaled.souf@gmail.com>
Upstream-commit: 15d92a9e03
Component: cli
 2017-08-29 16:30:37 +02:00
Li Yi
a4cd4da158 Support start_period for healthcheck in Docker Compose 
Signed-off-by: Li Yi <denverdino@gmail.com>
Upstream-commit: 0abdad615f
Component: cli
 2017-08-29 11:19:29 +08:00
Daniel Nephin
83dbde2057 Reduce complexity of two formatters 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d318c4112b
Component: cli
 2017-08-28 12:49:07 -04:00
Vincent Demeester
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
Component: cli
 2017-08-28 17:46:09 +02:00
Harald Albers
b812e1036b Use native formatting in bash completion of nodes 
Completion of nodes now uses native Docker commands that were not available
when this function was created.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e391e34801
Component: cli
 2017-08-28 09:59:19 +02:00
Ying Li
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
Component: cli
 2017-08-25 16:33:46 -07:00
Vincent Demeester
de5380dba8 Merge pull request #454 from mstanleyjones/resource-updating-windows 
docker update does not work on Windows containers
Upstream-commit: 21b5bbe411
Component: cli
 2017-08-25 19:57:12 +02:00
Misty Stanley-Jones
2d72ab2282 docker update does not work on Windows containers 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 047d3c23a7
Component: cli
 2017-08-25 10:35:28 -07:00
Daniel Nephin
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
Component: cli
 2017-08-25 12:37:47 -04:00
Daniel Nephin
9e09dbbb1a Merge pull request #469 from dnephin/add-testing-doc 
Add testing guidelines document
Upstream-commit: cfb228b963
Component: cli
 2017-08-25 12:35:16 -04:00
Vincent Demeester
3b7e9c65c0 Merge pull request #367 from kolyshkin/ipcmode 
Introduce/document new IPC modes
Upstream-commit: 8ebc03a71f
Component: cli
 2017-08-25 09:48:00 +02:00
Vincent Demeester
939356770a Merge pull request #468 from rubensfig/34373-docker-doc 
Added docker documentation for Expose
Upstream-commit: 1086e84718
Component: cli
 2017-08-25 09:07:16 +02:00
Daniel Nephin
3104a37598 Add TESTING document. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ffed6f5ff9
Component: cli
 2017-08-24 14:45:50 -04:00
Tibor Vass
7313d24a20 Merge pull request #445 from dnephin/add-end-to-end-suite 
Add end to end suite
Upstream-commit: 6c3d93bbb6
Component: cli
 2017-08-23 16:16:09 -07:00
Rubens Figueiredo
1d2c919b02 Added docker documentation for Expose 
Signed-off-by: Rubens Figueiredo <r.figueiredo.52@gmail.com>
Upstream-commit: dd95731a21
Component: cli
 2017-08-23 16:12:46 -07:00
Harald Albers
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
Component: cli
 2017-08-23 13:34:23 +02:00
Daniel Nephin
e11d0e6967 Merge pull request #440 from ripcurld0/search_format 
Add --format to docker-search
Upstream-commit: 05308fcec7
Component: cli
 2017-08-22 19:10:53 -04:00
Victor Vieux
19e250d57c Merge pull request #456 from dnephin/add-tests-for-client 
Add unit tests for initializing the client
Upstream-commit: 5e1d0289f4
Component: cli
 2017-08-22 16:08:36 -07:00
Boaz Shuster
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
Component: cli
 2017-08-23 01:37:54 +03:00
Daniel Nephin
b8932dcdf4 Merge pull request #463 from dnephin/remove-pkg-testutil 
Remove docker/docker/pkg/testutil
Upstream-commit: 79ecfa876b
Component: cli
 2017-08-22 13:53:03 -04:00
Marco Mariani
cd24988c20 support --compose-file - as stdin 
Signed-off-by: Marco Mariani <marco.mariani@alterway.fr>
Upstream-commit: 3a0b967c05
Component: cli
 2017-08-22 17:55:59 +02:00
Daniel Nephin
f71ceb67bc Allow extension fields in the v3.4 version of the compose format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2a1857e899
Component: cli
 2017-08-22 10:42:49 -04:00
Vincent Demeester
ba672661c5 Merge pull request #439 from ripcurld0/fix_image_ls_digest 
Show images digests when "{{.Digest}}" is in format
Upstream-commit: 317b735573
Component: cli
 2017-08-22 16:17:43 +02:00
Daniel Nephin
01f2e768d7 Use new internal testutil.ErrorContains() 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 846a31aa50
Component: cli
 2017-08-22 10:14:25 -04:00
Daniel Nephin
b141cbce57 Move internal/test package out of cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b3f843afe2
Component: cli
 2017-08-22 10:14:25 -04:00
Boaz Shuster
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
Component: cli
 2017-08-22 16:55:10 +03:00
Vincent Demeester
243671339d Merge pull request #386 from thaJeztah/fix-image-resolve-detection 
Fix image resolve detection
Upstream-commit: 8da1daeefa
Component: cli
 2017-08-22 15:05:39 +02:00
Vincent Demeester
34feb17aa0 Merge pull request #460 from krizalys/hyphenless-bind-mount 
Dropped hyphen in bind mount where appropriate
Upstream-commit: fa986e8039
Component: cli
 2017-08-21 20:29:27 +02:00