Silvin Lubecki and Vincent Demeester
6362580899
Fix stack marshaling for Kubernetes
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9b27e92903
Component: cli
2018-02-20 16:43:24 +01:00
Sebastiaan van Stijn and GitHub
74fad1551d
Merge pull request #888 from trapier/completion-swarm-event-filter-types
...
Add swarm types to bash completion event type filter
Upstream-commit: e34ca9740e
Component: cli
2018-02-20 10:13:25 +01:00
Trapier Marshall
5539b125fe
Add swarm types to bash completion event type filter
...
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com >
Upstream-commit: fb80101ca7
Component: cli
2018-02-19 13:46:23 -05:00
Vincent Demeester and GitHub
157ffc1e2f
Merge pull request #845 from vdemeester/stack-load-the-same
...
[compose] Share the compose loading code between swarm and k8s stack deploy
Upstream-commit: f56265ae3e
Component: cli
2018-02-19 15:28:40 +01:00
Vincent Demeester and GitHub
4d022ca109
Merge pull request #880 from vdemeester/container-list-unit-tests
...
Add unit tests to docker container ls
Upstream-commit: 8900d77a0b
Component: cli
2018-02-19 11:42:10 +01:00
Vincent Demeester
07a8b9380b
Add unit tests to docker container ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 581b8d9d72
Component: cli
2018-02-19 11:22:36 +01:00
Brian Goff and GitHub
37bb2f6b53
Merge pull request #883 from anusha-ragunathan/set_default_timeout
...
Set a non-zero timeout for HTTP client communication with plugin backend.
Upstream-commit: a0044ba3a7
Component: cli
2018-02-16 16:46:55 -05:00
Anusha Ragunathan
8bdc8e0190
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 >
Upstream-commit: f1e2030ce8
Component: cli
2018-02-16 12:00:58 -08:00
Daniel Nephin and GitHub
dd73a093e4
Merge pull request #564 from thaJeztah/fix-yaml-examples
...
Fix leading characters being stripped from example sections in YAML
Upstream-commit: 847cc4bdc0
Component: cli
2018-02-16 11:22:24 -05:00
Vincent Demeester and GitHub
44b01cd383
Merge pull request #840 from dekkagaijin/master
...
GetAll -> Get to retrieve credentials from credential helpers
Upstream-commit: 69432c48db
Component: cli
2018-02-16 15:38:53 +01:00
Vincent Demeester and GitHub
4a4ea266a9
Merge pull request #828 from thaJeztah/update-authors
...
Update authors
Upstream-commit: cb85d55e8d
Component: cli
2018-02-16 11:38:58 +01:00
Sebastiaan van Stijn
d3ed73b92e
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f8da04a510
Component: cli
2018-02-16 11:20:05 +01:00
Vincent Demeester and GitHub
d2ece4f9f2
Merge pull request #536 from thaJeztah/update-gitignore
...
Update gitignore
Upstream-commit: 2001500c6e
Component: cli
2018-02-16 10:26:58 +01:00
Sebastiaan van Stijn and GitHub
92f3e5322f
Merge pull request #372 from jphuynh/completion-zsh-event-filter
...
Update event filter zsh completion with `disable`, `enable`, `install…
Upstream-commit: c6a7046674
Component: cli
2018-02-16 10:16:40 +01:00
Vincent Demeester and GitHub
fec234b5f1
Merge pull request #878 from adshmh/add-unit-tests-to-plugin-package
...
Add unit tests to plugin create/remove/enable/disable commands
Upstream-commit: 4bc27c68ac
Component: cli
2018-02-15 18:02:36 +01:00
Arash Deshmeh
f2f9da3776
add tests to plugin create/remove/enable/disable commands. Part of work on #37
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 0a914da708
Component: cli
2018-02-15 06:20:26 -05:00
Vincent Demeester
86dfabe9b6
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 >
Upstream-commit: 570ee9cb54
Component: cli
2018-02-14 14:07:48 +01:00
Vincent Demeester and GitHub
4d4ce758aa
Merge pull request #876 from vdemeester/maintainers-clean
...
Remove some maintainers 👼
Upstream-commit: 3e5f2f29ad
Component: cli
2018-02-14 08:10:04 +01:00
Brian Goff and GitHub
c38f2d0ac2
Merge pull request #869 from mistyhacks/3343-swarm-network-plugins
...
Clarify network plugins and swarm mode
Upstream-commit: 9a264be221
Component: cli
2018-02-13 21:05:44 -05:00
Vincent Demeester
7f25d42388
Clean some maintainers 👼
...
aluzzardi, anusha, crosbymichael, ehazlett, johnstep, mavenugo, mlaventure 🤗
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2a56ebddcb
Component: cli
2018-02-13 11:32:54 +01:00
Sebastiaan van Stijn and GitHub
4efb1e07a3
Merge pull request #875 from kolyshkin/man
...
Improve man pages
Upstream-commit: 4519c83d44
Component: cli
2018-02-13 00:29:28 +01:00
Kir Kolyshkin
85207ef75c
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 >
Upstream-commit: 0d9bd33bab
Component: cli
2018-02-12 12:43:24 -08:00
Kir Kolyshkin
bd1e6937cb
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 >
Upstream-commit: 6566f5ff2c
Component: cli
2018-02-12 12:01:20 -08:00
Daniel Nephin and GitHub
119c362758
Merge pull request #872 from nogoegst/fix-unsupported-default-credential-store
...
Fix compilation of defaultCredentialStore() on unsupported platforms
Upstream-commit: dcd62981c4
Component: cli
2018-02-12 11:51:18 -05:00
Sebastiaan van Stijn and GitHub
5c9e151bc4
Merge pull request #841 from vdemeester/e2e-kill-test
...
Add e2e container kill test
Upstream-commit: 85f9fb56b3
Component: cli
2018-02-12 15:14:41 +01:00
Sebastiaan van Stijn and GitHub
3b4c1991cb
Merge pull request #871 from vdemeester/stack-deploy-update-ref
...
Update reference docs for docker stack deploy
Upstream-commit: 3e344ae425
Component: cli
2018-02-12 11:08:21 +01:00
Ivan Markin
6f3d7b05d2
Fix compilation of defaultCredentialStore() on unsupported platforms
...
Signed-off-by: Ivan Markin <sw@nogoegst.net >
Upstream-commit: 57c51c8af3
Component: cli
2018-02-10 15:30:32 +00:00
Jake Sanders
cd579fc565
defaultIndexserver -> defaultIndexServer
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: e1b607a351
Component: cli
2018-02-09 13:48:01 -08:00
Vincent Demeester
ffb77fa93a
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 >
Upstream-commit: 4c50007496
Component: cli
2018-02-09 14:22:45 +01:00
Misty Stanley-Jones
4415397c48
Clarify network plugins and swarm mode
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 16d29b3cd6
Component: cli
2018-02-08 14:08:31 -08:00
Daniel Nephin and GitHub
7a31f33f22
Merge pull request #868 from thaJeztah/bump-golang-1.9.4
...
Bump golang to 1.9.4
Upstream-commit: a9ecf823ff
Component: cli
2018-02-08 08:06:52 -08:00
Brian Goff and GitHub
c00977eb44
Merge pull request #867 from sungwonh/prune
...
Clarify description of volume prune command
Upstream-commit: 704d37db8f
Component: cli
2018-02-08 09:56:15 -05:00
Sebastiaan van Stijn
940ea8083a
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 >
Upstream-commit: b32599761f
Component: cli
2018-02-08 00:56:12 -08:00
Sungwon Han
770eb4a40c
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 >
Upstream-commit: 34504d0a1e
Component: cli
2018-02-08 15:33:07 +09:00
Sebastiaan van Stijn and GitHub
5007511cdb
Merge pull request #863 from WTFKr0/tls-env-var
...
Add DOCKER_TLS environment variable for --tls option
Upstream-commit: b5df4f69db
Component: cli
2018-02-06 10:24:38 -08:00
Sebastiaan van Stijn and GitHub
5421c51a06
Merge pull request #569 from vdemeester/compose-multiple-version-mergo
...
Add support for multiple composefile when deploying
Upstream-commit: 25e969c854
Component: cli
2018-02-06 00:41:43 -08:00
WTFKr0
3bb4e932f7
Add DOCKER_TLS environment variable
...
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com >
Upstream-commit: 42fa3ef7d8
Component: cli
2018-02-06 09:27:05 +01:00
Jake Sanders
ac13dc6ce4
Use Get rather than GetAll to retrieve credentials from credential helpers.
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: 1d0a37c460
Component: cli
2018-02-05 20:31:46 -08:00
Sebastiaan van Stijn and GitHub
8e79d4b5b1
Merge pull request #860 from mistyhacks/explain-netio-blockio
...
Explain the columns shown in docker stats
Upstream-commit: e12f71a9b8
Component: cli
2018-02-05 18:47:24 -08:00
Sebastiaan van Stijn and GitHub
70566138f9
Merge pull request #858 from mistyhacks/add-registry-auth-example
...
Add an example for --with-registry-auth
Upstream-commit: ce985d04ce
Component: cli
2018-02-05 18:45:50 -08:00
Sebastiaan van Stijn and GitHub
3443bd57ad
Merge pull request #862 from dnephin/fix-vendor-validation
...
Fix vendor validation (and vendor)
Upstream-commit: 0c80cafe78
Component: cli
2018-02-02 15:34:09 -08:00
Daniel Nephin
cb4ddc2058
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 >
Upstream-commit: a6dedd1a12
Component: cli
2018-02-02 11:01:05 -08:00
Vincent Demeester and GitHub
c38d4936f4
Merge pull request #682 from albers/completion-service-options
...
Fix and simplify bash completion for service env, mounts and labels
Upstream-commit: 26a2a45967
Component: cli
2018-02-01 14:02:51 -08:00
Vincent Demeester and GitHub
be8b7a4dfb
Merge pull request #851 from mistyhacks/overlay-network-limits
...
Doc guidance to only use 256 IPs per overlay
Upstream-commit: 19e4389a72
Component: cli
2018-02-01 11:11:27 -08:00
Sebastiaan van Stijn and GitHub
d25b4a3533
Merge pull request #859 from mistyhacks/quotes-around-format-strings
...
Add quotes around format template
Upstream-commit: 5bf0d76494
Component: cli
2018-01-31 21:40:08 -08:00
Misty Stanley-Jones
20111ede63
Explain the columns shown in docker stats
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0219338781
Component: cli
2018-01-31 17:05:54 -08:00
Misty Stanley-Jones
2daf468e57
Add quotes around format template
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0b6aeae007
Component: cli
2018-01-31 16:51:43 -08:00
Vincent Demeester and GitHub
d30180eaf5
Merge pull request #857 from mistyhacks/5759_typo-in-builder
...
Fix doubled word in note
Upstream-commit: 3aac740478
Component: cli
2018-01-31 14:51:37 -08:00
Misty Stanley-Jones
dc47308ffd
Add an example for --with-registry-auth
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 821452629c
Component: cli
2018-01-31 13:38:49 -08:00
Misty Stanley-Jones
0a7bda1a7c
Fix doubled word in note
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: a2bb62683d
Component: cli
2018-01-31 13:05:58 -08:00