Brian Goff
a0044ba3a7
Merge pull request #883 from anusha-ragunathan/set_default_timeout
...
Set a non-zero timeout for HTTP client communication with plugin backend.
2018-02-16 16:46:55 -05:00
Anusha Ragunathan
f1e2030ce8
Set a non-zero timeout for HTTP client communication with plugin
...
backend.
Currently, the timeout is set to 0, which means no timeout. Set it to a
sane default timeout of 30 seconds.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2018-02-16 12:00:58 -08:00
Daniel Nephin
847cc4bdc0
Merge pull request #564 from thaJeztah/fix-yaml-examples
...
Fix leading characters being stripped from example sections in YAML
2018-02-16 11:22:24 -05:00
Vincent Demeester
69432c48db
Merge pull request #840 from dekkagaijin/master
...
GetAll -> Get to retrieve credentials from credential helpers
2018-02-16 15:38:53 +01:00
Vincent Demeester
cb85d55e8d
Merge pull request #828 from thaJeztah/update-authors
...
Update authors
2018-02-16 11:38:58 +01:00
Sebastiaan van Stijn
f8da04a510
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-16 11:20:05 +01:00
Vincent Demeester
2001500c6e
Merge pull request #536 from thaJeztah/update-gitignore
...
Update gitignore
2018-02-16 10:26:58 +01:00
Sebastiaan van Stijn
c6a7046674
Merge pull request #372 from jphuynh/completion-zsh-event-filter
...
Update event filter zsh completion with `disable`, `enable`, `install…
2018-02-16 10:16:40 +01:00
Alexander Ryabov
94ecd2ba73
Document service --network long form
...
Signed-off-by: Alexander Ryabov <i@sepa.spb.ru>
2018-02-16 09:34:42 +03:00
Vincent Demeester
4bc27c68ac
Merge pull request #878 from adshmh/add-unit-tests-to-plugin-package
...
Add unit tests to plugin create/remove/enable/disable commands
2018-02-15 18:02:36 +01:00
Arash Deshmeh
0a914da708
add tests to plugin create/remove/enable/disable commands. Part of work on #37
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-02-15 06:20:26 -05:00
Vincent Demeester
570ee9cb54
Share the compose loading code between swarm and k8s stack deploy
...
To ensure we are loading the composefile the same wether we are pointing
to swarm or kubernetes, we need to share the loading code between both.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-14 14:07:48 +01:00
Vincent Demeester
3e5f2f29ad
Merge pull request #876 from vdemeester/maintainers-clean
...
Remove some maintainers 👼
2018-02-14 08:10:04 +01:00
Brian Goff
9a264be221
Merge pull request #869 from mistyhacks/3343-swarm-network-plugins
...
Clarify network plugins and swarm mode
2018-02-13 21:05:44 -05:00
Vincent Demeester
2a56ebddcb
Clean some maintainers 👼
...
aluzzardi, anusha, crosbymichael, ehazlett, johnstep, mavenugo, mlaventure 🤗
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-13 11:32:54 +01:00
Sebastiaan van Stijn
4519c83d44
Merge pull request #875 from kolyshkin/man
...
Improve man pages
2018-02-13 00:29:28 +01:00
Kir Kolyshkin
0d9bd33bab
man/docker-run.1.md: --restart, --ipc, --network options
...
Describe the possible values for `--restart`, `--ipc`, and `--network`
options. While at it, improve formatting for `--name` options arguments.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-02-12 12:43:24 -08:00
Kir Kolyshkin
6566f5ff2c
Bump cpuguy83/go-md2man to v1.0.8
...
The biggest motivation for this is proper table rendering; in the
old version it was broken so tables were not rendered at al
(i.e. anything that was put into table was lost, for example,
description of LOG_* log levels in dockerd(8) page).
This also fixes lists, including nested lists. This fixes the
description of behavior in docker-cp(1) which is rendered as a tree:
BEFORE:
```
Assuming a path separator of /, a first argument of SRC_PATH and second
argument of DEST_PATH, the behavior is as follows:
· SRC_PATH specifies a file
· DEST_PATH does not exist
· the file is saved to a file created at DEST_PATH
· DEST_PATH does not exist and ends with /
· Error condition: the destination directory must exist.
...
```
AFTER:
```
Assuming a path separator of /, a first argument of SRC_PATH and second
argument of DEST_PATH, the behavior is as follows:
· SRC_PATH specifies a file
· DEST_PATH does not exist
· the file is saved to a file created at DEST_PATH
· DEST_PATH does not exist and ends with /
· Error condition: the destination directory must exist.
...
```
Manually checking the diff between the man pages generated by the old
and the new version, there are no changes other than the indentation
(.RS/.RE) for lists, and proper formatting for tables. Formatted man
pages also look decent, nothing seems broken.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-02-12 12:01:20 -08:00
Daniel Nephin
b127b8d927
Replace go-bindata with esc
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-12 14:23:19 -05:00
Daniel Nephin
dcd62981c4
Merge pull request #872 from nogoegst/fix-unsupported-default-credential-store
...
Fix compilation of defaultCredentialStore() on unsupported platforms
2018-02-12 11:51:18 -05:00
Sebastiaan van Stijn
85f9fb56b3
Merge pull request #841 from vdemeester/e2e-kill-test
...
Add e2e container kill test
2018-02-12 15:14:41 +01:00
Sebastiaan van Stijn
3e344ae425
Merge pull request #871 from vdemeester/stack-deploy-update-ref
...
Update reference docs for docker stack deploy
2018-02-12 11:08:21 +01:00
Ivan Markin
57c51c8af3
Fix compilation of defaultCredentialStore() on unsupported platforms
...
Signed-off-by: Ivan Markin <sw@nogoegst.net>
2018-02-10 15:30:32 +00:00
Jake Sanders
e1b607a351
defaultIndexserver -> defaultIndexServer
...
Signed-off-by: Jake Sanders <jsand@google.com>
2018-02-09 13:48:01 -08:00
Vincent Demeester
4c50007496
Update reference docs for docker stack deploy
...
`docker stack deploy` now support multiple composefil. This updates the
reference doc to take that fact into account.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-09 14:22:45 +01:00
Misty Stanley-Jones
16d29b3cd6
Clarify network plugins and swarm mode
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-02-08 14:08:31 -08:00
Daniel Nephin
a9ecf823ff
Merge pull request #868 from thaJeztah/bump-golang-1.9.4
...
Bump golang to 1.9.4
2018-02-08 08:06:52 -08:00
Brian Goff
704d37db8f
Merge pull request #867 from sungwonh/prune
...
Clarify description of volume prune command
2018-02-08 09:56:15 -05:00
Sebastiaan van Stijn
b32599761f
Bump golang to 1.9.4
...
This fixes a vulnerability in `go get` (CVE-2018-6574, http://golang.org/issue/23672 ),
but shouldn't really affect our code, but it's good to keep in sync.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-08 00:56:12 -08:00
Sungwon Han
34504d0a1e
Clarify description of volume prune command
...
volume prune command removes only local volumes
not used by at least one container.
Signed-off-by: Sungwon Han <sungwon.han@navercorp.com>
2018-02-08 15:33:07 +09:00
Sebastiaan van Stijn
b5df4f69db
Merge pull request #863 from WTFKr0/tls-env-var
...
Add DOCKER_TLS environment variable for --tls option
2018-02-06 10:24:38 -08:00
Sebastiaan van Stijn
25e969c854
Merge pull request #569 from vdemeester/compose-multiple-version-mergo
...
Add support for multiple composefile when deploying
2018-02-06 00:41:43 -08:00
WTFKr0
42fa3ef7d8
Add DOCKER_TLS environment variable
...
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
2018-02-06 09:27:05 +01:00
Jake Sanders
1d0a37c460
Use Get rather than GetAll to retrieve credentials from credential helpers.
...
Signed-off-by: Jake Sanders <jsand@google.com>
2018-02-05 20:31:46 -08:00
Sebastiaan van Stijn
e12f71a9b8
Merge pull request #860 from mistyhacks/explain-netio-blockio
...
Explain the columns shown in docker stats
2018-02-05 18:47:24 -08:00
Sebastiaan van Stijn
ce985d04ce
Merge pull request #858 from mistyhacks/add-registry-auth-example
...
Add an example for --with-registry-auth
2018-02-05 18:45:50 -08:00
Sebastiaan van Stijn
0c80cafe78
Merge pull request #862 from dnephin/fix-vendor-validation
...
Fix vendor validation (and vendor)
2018-02-02 15:34:09 -08:00
Daniel Nephin
a6dedd1a12
Fix vendor validation
...
vendor/ must be removed first, otherwise files added to vendor/ but not vendor.conf
will not cause the validation to fail
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2018-02-02 11:01:05 -08:00
Vincent Demeester
26a2a45967
Merge pull request #682 from albers/completion-service-options
...
Fix and simplify bash completion for service env, mounts and labels
2018-02-01 14:02:51 -08:00
Vincent Demeester
19e4389a72
Merge pull request #851 from mistyhacks/overlay-network-limits
...
Doc guidance to only use 256 IPs per overlay
2018-02-01 11:11:27 -08:00
Sebastiaan van Stijn
5bf0d76494
Merge pull request #859 from mistyhacks/quotes-around-format-strings
...
Add quotes around format template
2018-01-31 21:40:08 -08:00
Misty Stanley-Jones
0219338781
Explain the columns shown in docker stats
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-01-31 17:05:54 -08:00
Misty Stanley-Jones
0b6aeae007
Add quotes around format template
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-01-31 16:51:43 -08:00
Vincent Demeester
3aac740478
Merge pull request #857 from mistyhacks/5759_typo-in-builder
...
Fix doubled word in note
2018-01-31 14:51:37 -08:00
Misty Stanley-Jones
821452629c
Add an example for --with-registry-auth
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-01-31 13:38:49 -08:00
Misty Stanley-Jones
a2bb62683d
Fix doubled word in note
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-01-31 13:05:58 -08:00
Daniel Nephin
3988d9cfd9
Merge pull request #853 from thaJeztah/bump-go-connections
...
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
2018-01-31 10:22:41 -08:00
Daniel Nephin
4a03f2a4ae
Merge pull request #852 from thaJeztah/bump-version-18.03
...
Bump VERSION to 18.03.0-dev
2018-01-31 10:21:54 -08:00
Sebastiaan van Stijn
b7a9f027f3
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-31 01:38:06 -08:00
Sebastiaan van Stijn
beb0d08e48
Bump VERSION to 18.03.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-31 01:34:51 -08:00