04390f8a74
Merge pull request #508 from docker/revert-493-patch-1
...
Revert "Change sshfs by cloudstor on Installing and using a plugin"
2017-09-11 11:25:50 -07:00
d0bda815d2
Merge pull request #521 from dnephin/add-albers-to-maintainers
...
Add albers to maintainers
2017-09-11 19:47:20 +02:00
92cf825238
Add albers to maintainers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-11 11:22:10 -04:00
e77dc2232e
Merge pull request #421 from thaJeztah/refactor-docker-info
...
Refactor/cleanup of docker info
2017-09-11 15:25:02 +02:00
6f1b510843
Refactor/cleanup of docker info
...
Some mild refactoring of the docker info command;
- Use `fmt.Fprinln()` instead of `fmt.Fprintf()` where possible
- Rename `fprintfIfNotEmpty()` to `fprintlnNonEmpty()`, and removed
return variables, because they were not used. `fprintlnNonEmpty()`
now uses fmt.Fprintln()` instead of `fmt.Fprintf()`, because
formatting was not used.
- Use `fprintlnNonEmpty()` to get rid of some `if` statements
- Extract printing Swarm-related information to a `printSwarmInfo()` function
- Change `Http Proxy` and `Https Proxy` to `HTTP Proxy` / `HTTPS Proxy`
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-09-11 15:13:06 +02:00
202205365a
Merge pull request #519 from gesellix/typo-configration
...
[docs] Fix typo in configration.
2017-09-11 14:57:08 +02:00
f8ed8d22c6
[docs] Fix typo in configration.
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2017-09-10 23:12:29 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
683b6226ed
Add gotestyourself/poll
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-06 17:07:35 -04:00
36068e8763
Add bash completion for `dockerd --network-control-plane-mtu`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-09-05 21:29:44 +02:00
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
5c5cdd0e36
Merge pull request #424 from simonferquel/update-vendoring
...
updated vendoring
2017-09-05 15:06:09 -04:00
ec99774a85
Merge pull request #406 from ksouf/issue_37_network_list_test
...
adding network list test
2017-09-05 11:24:32 -04:00
f6219ac3c6
Add bash completion for `search --format`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-09-04 18:21:47 +02:00
38c1895021
Merge pull request #491 from FrenchBen/fix-stack
...
Move output of stack rm to stdout
2017-09-04 15:56:30 +02:00
724f03bb23
Remove unused depdendencies from vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-09-01 19:41:06 -04:00
a0113c3a44
updated vendoring
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-09-01 19:41:06 -04:00
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
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
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
15d92a9e03
adding network list test
...
Signed-off-by: khaled souf <khaled.souf@gmail.com>
2017-08-29 16:30:37 +02: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
Misty Stanley-Jones
Vincent Demeester
Daniel Nephin
Sebastiaan van Stijn
Sebastiaan van Stijn
Tobias Gesellchen
Andrew Hsu
Victor Vieux
pnagy
Liron Levin
Harald Albers
Daniel Nephin
Simon Ferquel
French Ben
Julien Maitrehenry
Eli Uriegas
Boaz Shuster
Li Yi
Tibor Vass
khaled souf
Li Yi