591014017f
Add albers to maintainers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 92cf825238
2017-09-11 11:22:10 -04:00
8e2757c531
Merge pull request #421 from thaJeztah/refactor-docker-info
...
Refactor/cleanup of docker info
Upstream-commit: e77dc2232e
2017-09-11 15:25:02 +02:00
033298b8f6
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 >
Upstream-commit: 6f1b510843
2017-09-11 15:13:06 +02:00
1b8f2ad866
[docs] Fix typo in configration.
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: f8ed8d22c6
2017-09-10 23:12:29 +02:00
30a4e0ab8e
Merge pull request #510 from dnephin/add-parse-log-details
...
Use a local copy of ParseLogDetails
Upstream-commit: aae519d0f6
2017-09-08 11:38:24 -07:00
fbd21afa80
Merge pull request #511 from dnephin/fix-end-of-line-whitespace-tests
...
Use golden files for tests that expect end-of-line whitespace
Upstream-commit: d3d9b38d55
2017-09-08 11:37:28 -07:00
94dd311bdc
Merge pull request #495 from dnephin/container-run-e2e
...
Add en e2e test for `container run`
Upstream-commit: cc517f2d8a
2017-09-08 11:36:32 -07:00
d7ed53048b
Use golden files for tests that expect end-of-line whitespace
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 51587de1c4
2017-09-07 17:50:44 -04:00
0d3330814c
Use a local copy of ParseLogDetails
...
It's being removed from client/
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a747389bf4
2017-09-07 12:50:25 -04:00
74473d87d6
Merge pull request #493 from jmaitrehenry/patch-1
...
Change sshfs by cloudstor on Installing and using a plugin
Upstream-commit: af94015b8c
2017-09-06 14:42:34 -07:00
4a595ff1d9
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 >
Upstream-commit: c34360cc8e
2017-09-06 17:07:38 -04:00
6fc4c48771
Move common e2e things into an internal package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 677d17150a
2017-09-06 17:07:38 -04:00
e65a64c87e
Add gotestyourself/poll
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 683b6226ed
2017-09-06 17:07:35 -04:00
33d6fdcfda
Merge pull request #353 from albers/completion-nodelist
...
Use native formatting in bash completion of nodes
Upstream-commit: 0426ea1443
2017-09-05 15:09:00 -04:00
28cf6767d3
Merge pull request #424 from simonferquel/update-vendoring
...
updated vendoring
Upstream-commit: 5c5cdd0e36
2017-09-05 15:06:09 -04:00
e76adc6a0e
Merge pull request #406 from ksouf/issue_37_network_list_test
...
adding network list test
Upstream-commit: ec99774a85
2017-09-05 11:24:32 -04:00
444c2e65a4
Remove unused depdendencies from vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 724f03bb23
2017-09-01 19:41:06 -04:00
4bafd44516
updated vendoring
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: a0113c3a44
2017-09-01 19:41:06 -04:00
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
2017-09-01 14:25:20 -07:00
d99a5ff6bf
Change sshfs by cloudstor on Installing and using a plugin
...
Signed-off-by: Julien Maitrehenry <julien.maitrehenry@me.com >
Upstream-commit: e97d72334f
2017-09-01 14:42:01 -04:00
f119dacce1
Merge pull request #485 from seemethere/re_add_test_target
...
Re-adds test target to the Makefile
Upstream-commit: d861a1c3dd
2017-08-31 17:50:14 -07:00
d48b9a840a
Merge pull request #489 from dnephin/fix-container-run
...
Fix crash in container run after pulling an image
Upstream-commit: d817967647
2017-08-31 18:11:26 -04:00
5ed8076112
Merge pull request #484 from ripcurld0/ps_exit_1
...
When nothing found in stack exit with exit code 1
Upstream-commit: 5a9bf7f359
2017-08-31 17:13:00 -04:00
264557313d
Fix crash in containe run after pulling an image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a0d8d80250
2017-08-31 17:08:02 -04:00
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
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
2017-08-30 23:25:36 +03: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
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
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
6eb6b7d9d2
adding network list test
...
Signed-off-by: khaled souf <khaled.souf@gmail.com >
Upstream-commit: 15d92a9e03
2017-08-29 16:30:37 +02: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
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
2017-08-28 09:59:19 +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
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
