Commit Graph

4561 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 202205365a Merge pull request #519 from gesellix/typo-configration
[docs] Fix typo in configration.
2017-09-11 14:57:08 +02:00
Tobias Gesellchen f8ed8d22c6 [docs] Fix typo in configration.
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2017-09-10 23:12:29 +02:00
Andrew Hsu ef027b6d72 vndr docker/docker to ea220e7 to bring in fix for arm
Primarily to bring in fix for "Clear Architecture field in platform
constraint for arm architectures".

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-09-08 16:27:56 -07:00
Victor Vieux aae519d0f6 Merge pull request #510 from dnephin/add-parse-log-details
Use a local copy of ParseLogDetails
2017-09-08 11:38:24 -07:00
Victor Vieux d3d9b38d55 Merge pull request #511 from dnephin/fix-end-of-line-whitespace-tests
Use golden files for tests that expect end-of-line whitespace
2017-09-08 11:37:28 -07:00
Victor Vieux cc517f2d8a Merge pull request #495 from dnephin/container-run-e2e
Add en e2e test for `container run`
2017-09-08 11:36:32 -07:00
pnagy 27e8bdf32b 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>
2017-09-08 16:09:48 +02:00
Daniel Nephin 51587de1c4 Use golden files for tests that expect end-of-line whitespace
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-07 17:50:44 -04:00
Misty Stanley-Jones eb77961399 Revert "Change sshfs by cloudstor on Installing and using a plugin"
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-09-07 10:15:59 -07:00
Daniel Nephin a747389bf4 Use a local copy of ParseLogDetails
It's being removed from client/

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-07 12:50:25 -04:00
Liron Levin 0ee9e05d8f Plugable secret backend
This commit extends SwarmKit secret management with pluggable secret
backends support.
Following previous commits:
1. docker/swarmkit@eebac27434
2. docker/docker@08f7cf0526
Added driver parameter to `docker secret` command.

Specifically:

1. `docker secret create [secret_name] --driver [driver_name]`
2.  Displaying the driver in
```
    $ docker secret ls
    $ docker secret inspect [secret_name]
    $ docker secret inspect [secret_name] -pretty
```

Signed-off-by: Liron Levin <liron@twistlock.com>
2017-09-07 11:10:44 +03:00
Misty Stanley-Jones af94015b8c Merge pull request #493 from jmaitrehenry/patch-1
Change sshfs by cloudstor on Installing and using a plugin
2017-09-06 14:42:34 -07:00
Daniel Nephin c34360cc8e Add an end-to-end test for container run
for testing attach, remove, and pull image when missing.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-06 17:07:38 -04:00
Daniel Nephin 677d17150a Move common e2e things into an internal package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-06 17:07:38 -04:00
Daniel Nephin 683b6226ed Add gotestyourself/poll
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-06 17:07:35 -04:00
Daniel Nephin 0426ea1443 Merge pull request #353 from albers/completion-nodelist
Use native formatting in bash completion of nodes
2017-09-05 15:09:00 -04:00
Daniel Nephin 5c5cdd0e36 Merge pull request #424 from simonferquel/update-vendoring
updated vendoring
2017-09-05 15:06:09 -04:00
Daniel Nephin ec99774a85 Merge pull request #406 from ksouf/issue_37_network_list_test
adding network list test
2017-09-05 11:24:32 -04:00
Harald Albers f6219ac3c6 Add bash completion for `search --format`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-09-04 18:21:47 +02:00
Vincent Demeester 38c1895021 Merge pull request #491 from FrenchBen/fix-stack
Move output of stack rm to stdout
2017-09-04 15:56:30 +02:00
Daniel Nephin 724f03bb23 Remove unused depdendencies from vendor
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-01 19:41:06 -04:00
Simon Ferquel a0113c3a44 updated vendoring
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-09-01 19:41:06 -04:00
French Ben bb8f49773c 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>
2017-09-01 14:25:20 -07:00
Julien Maitrehenry e97d72334f Change sshfs by cloudstor on Installing and using a plugin
Signed-off-by: Julien Maitrehenry <julien.maitrehenry@me.com>
2017-09-01 14:42:01 -04:00
Victor Vieux 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
Eli Uriegas 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
Boaz Shuster 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
Daniel Nephin 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
Victor Vieux 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
Li Yi 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
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin bdc8cf364e Add ulimits to unsupported compose fields.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 17:05:16 -04:00
Tibor Vass e6006219ab Merge pull request #480 from dnephin/remove-unnecessary-deps
Remove 5k lines of unnecessary dependencies
2017-08-29 10:37:43 -07:00
Daniel Nephin 8edd2dd3df Remove unused vendor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-29 13:22:17 -04:00
Daniel Nephin 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
Daniel Nephin 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
khaled souf 15d92a9e03 adding network list test
Signed-off-by: khaled souf <khaled.souf@gmail.com>
2017-08-29 16:30:37 +02:00
Li Yi 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
Daniel Nephin d318c4112b Reduce complexity of two formatters
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-08-28 12:49:07 -04:00
Vincent Demeester 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
Harald Albers e391e34801 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>
2017-08-28 09:59:19 +02:00
Harald Albers 056ccf88be Improve bash completion for `--credential-spec`
This option is Windows specific and should be only available if the
daemon runs on Windows.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-08-28 09:53:58 +02:00
Ying Li 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
Vincent Demeester 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
Misty Stanley-Jones 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
Daniel Nephin 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