Silvin Lubecki
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
2018-02-20 16:43:24 +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
2018-02-19 13:46:23 -05:00
Vincent Demeester
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
2018-02-19 15:28:40 +01:00
Vincent Demeester
4d022ca109
Merge pull request #880 from vdemeester/container-list-unit-tests
...
Add unit tests to docker container ls
Upstream-commit: 8900d77a0b
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
2018-02-19 11:22:36 +01: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
2018-02-16 12:00:58 -08:00
Daniel Nephin
dd73a093e4
Merge pull request #564 from thaJeztah/fix-yaml-examples
...
Fix leading characters being stripped from example sections in YAML
Upstream-commit: 847cc4bdc0
2018-02-16 11:22:24 -05:00
Vincent Demeester
44b01cd383
Merge pull request #840 from dekkagaijin/master
...
GetAll -> Get to retrieve credentials from credential helpers
Upstream-commit: 69432c48db
2018-02-16 15:38:53 +01:00
Sebastiaan van Stijn
d3ed73b92e
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f8da04a510
2018-02-16 11:20:05 +01:00
Vincent Demeester
d2ece4f9f2
Merge pull request #536 from thaJeztah/update-gitignore
...
Update gitignore
Upstream-commit: 2001500c6e
2018-02-16 10:26:58 +01:00
Sebastiaan van Stijn
92f3e5322f
Merge pull request #372 from jphuynh/completion-zsh-event-filter
...
Update event filter zsh completion with `disable`, `enable`, `install…
Upstream-commit: c6a7046674
2018-02-16 10:16:40 +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
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
2018-02-14 14:07:48 +01:00
Vincent Demeester
4d4ce758aa
Merge pull request #876 from vdemeester/maintainers-clean
...
Remove some maintainers 👼
Upstream-commit: 3e5f2f29ad
2018-02-14 08:10:04 +01:00
Brian Goff
c38f2d0ac2
Merge pull request #869 from mistyhacks/3343-swarm-network-plugins
...
Clarify network plugins and swarm mode
Upstream-commit: 9a264be221
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
2018-02-13 11:32:54 +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
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
2018-02-12 12:01:20 -08:00
Daniel Nephin
119c362758
Merge pull request #872 from nogoegst/fix-unsupported-default-credential-store
...
Fix compilation of defaultCredentialStore() on unsupported platforms
Upstream-commit: dcd62981c4
2018-02-12 11:51:18 -05:00
Sebastiaan van Stijn
5c9e151bc4
Merge pull request #841 from vdemeester/e2e-kill-test
...
Add e2e container kill test
Upstream-commit: 85f9fb56b3
2018-02-12 15:14:41 +01:00
Ivan Markin
6f3d7b05d2
Fix compilation of defaultCredentialStore() on unsupported platforms
...
Signed-off-by: Ivan Markin <sw@nogoegst.net >
Upstream-commit: 57c51c8af3
2018-02-10 15:30:32 +00:00
Jake Sanders
cd579fc565
defaultIndexserver -> defaultIndexServer
...
Signed-off-by: Jake Sanders <jsand@google.com >
Upstream-commit: e1b607a351
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
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
2018-02-08 14:08:31 -08:00
Daniel Nephin
7a31f33f22
Merge pull request #868 from thaJeztah/bump-golang-1.9.4
...
Bump golang to 1.9.4
Upstream-commit: a9ecf823ff
2018-02-08 08:06:52 -08: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
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
2018-02-08 15:33:07 +09:00
Sebastiaan van Stijn
5007511cdb
Merge pull request #863 from WTFKr0/tls-env-var
...
Add DOCKER_TLS environment variable for --tls option
Upstream-commit: b5df4f69db
2018-02-06 10:24:38 -08:00
Sebastiaan van Stijn
5421c51a06
Merge pull request #569 from vdemeester/compose-multiple-version-mergo
...
Add support for multiple composefile when deploying
Upstream-commit: 25e969c854
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
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
2018-02-05 20:31:46 -08:00
Sebastiaan van Stijn
8e79d4b5b1
Merge pull request #860 from mistyhacks/explain-netio-blockio
...
Explain the columns shown in docker stats
Upstream-commit: e12f71a9b8
2018-02-05 18:47:24 -08:00
Sebastiaan van Stijn
70566138f9
Merge pull request #858 from mistyhacks/add-registry-auth-example
...
Add an example for --with-registry-auth
Upstream-commit: ce985d04ce
2018-02-05 18:45:50 -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
2018-02-02 11:01:05 -08:00
Vincent Demeester
c38d4936f4
Merge pull request #682 from albers/completion-service-options
...
Fix and simplify bash completion for service env, mounts and labels
Upstream-commit: 26a2a45967
2018-02-01 14:02:51 -08:00
Vincent Demeester
be8b7a4dfb
Merge pull request #851 from mistyhacks/overlay-network-limits
...
Doc guidance to only use 256 IPs per overlay
Upstream-commit: 19e4389a72
2018-02-01 11:11:27 -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
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
2018-01-31 16:51:43 -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
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
2018-01-31 13:05:58 -08:00
Daniel Nephin
6bed3b4c11
Merge pull request #853 from thaJeztah/bump-go-connections
...
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
Upstream-commit: 3988d9cfd9
2018-01-31 10:22:41 -08:00
Sebastiaan van Stijn
e5e113b93d
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b7a9f027f3
2018-01-31 01:38:06 -08:00
Sebastiaan van Stijn
aef7840d1c
Bump VERSION to 18.03.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: beb0d08e48
2018-01-31 01:34:51 -08:00
Misty Stanley-Jones
198448e674
Doc guidance to only use 256 IPs per overlay
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 6085b5d3aa
2018-01-30 15:41:53 -08:00
Vincent Demeester
2cc4e9e5e9
Add e2e container kill test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 42edad2fc7
2018-01-30 15:38:45 -08:00
Sebastiaan van Stijn
7de8b77c33
Merge pull request #848 from mistyhacks/fix-publish-table
...
Fix the network option table
Upstream-commit: bb9e5ab767
2018-01-30 14:32:32 -08:00
Misty Stanley-Jones
d0e1c8724c
Fix the network option table
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 773ccdec7b
2018-01-30 14:00:48 -08:00
Misty Stanley-Jones
b0db1afb21
Add examples of prune by label
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: bc28bf13f7
2018-01-30 11:29:45 -08:00
Sebastiaan van Stijn
db1ce9af6b
Merge pull request #838 from vdemeester/fix-label-file-behavior
...
Fix `--label-file` weird behavior
Upstream-commit: 9de1b162fa
2018-01-29 17:32:21 -08:00
Vincent Demeester
4d611b9990
Add support for multiple composefile when deploying
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1872bd802c
2018-01-29 17:27:25 -08:00
Silvin Lubecki
Trapier Marshall
Vincent Demeester
Vincent Demeester
Anusha Ragunathan
Daniel Nephin
Sebastiaan van Stijn
Sebastiaan van Stijn
Arash Deshmeh
Brian Goff
Kir Kolyshkin
Ivan Markin
Jake Sanders
Misty Stanley-Jones
Sungwon Han
WTFKr0