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
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
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
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
Misty Stanley-Jones
6085b5d3aa
Doc guidance to only use 256 IPs per overlay
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-01-30 15:41:53 -08:00
Vincent Demeester
42edad2fc7
Add e2e container kill test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-30 15:38:45 -08:00
Sebastiaan van Stijn
bb9e5ab767
Merge pull request #848 from mistyhacks/fix-publish-table
...
Fix the network option table
2018-01-30 14:32:32 -08:00
Misty Stanley-Jones
773ccdec7b
Fix the network option table
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-01-30 14:00:48 -08:00
Sebastiaan van Stijn
0aabbb09b6
Merge pull request #849 from mistyhacks/add-filter-label-example
...
Add examples of prune by label
2018-01-30 13:52:34 -08:00
Misty Stanley-Jones
bc28bf13f7
Add examples of prune by label
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2018-01-30 11:29:45 -08:00
Sebastiaan van Stijn
9de1b162fa
Merge pull request #838 from vdemeester/fix-label-file-behavior
...
Fix `--label-file` weird behavior
2018-01-29 17:32:21 -08:00
Vincent Demeester
1872bd802c
Add support for multiple composefile when deploying
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-29 17:27:25 -08:00
Daniel Nephin
7da324a2f6
Merge pull request #844 from tophj-ibm/bump-to-go-1-9-3
...
Bump Go to 1.9.3 (cont.)
2018-01-29 16:17:28 -05:00
Vincent Demeester
2b17f4c8a8
Fix `--label-file` weird behavior
...
`--label-file` has the exact same behavior as `--env-file`, meaning any
placeholder (i.e. a simple key, no `=` sign, no value), it will get the
value from the environment variable.
For `--label-file` it should just add an empty label.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-29 11:08:54 -08:00
Christopher Jones
d89f5fa731
Bump Go to 1.9.3
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2018-01-29 13:43:59 -05:00
Sebastiaan van Stijn
4586609f71
Merge pull request #717 from albers/completion-images-2
...
Improve and fix bash completion for images
2018-01-27 17:48:49 -08:00
Daniel Nephin
a46fa0759d
Merge pull request #804 from thaJeztah/more-annotations
...
Annotate "stack" commands to be "swarm" and "kubernetes"
2018-01-26 15:12:09 -05:00
Vincent Demeester
44e93ddd13
Merge pull request #829 from thaJeztah/bump-moby
...
Bump moby and dependencies
2018-01-26 10:42:14 -08:00
Daniel Nephin
819df0ebf6
Merge pull request #827 from thaJeztah/bump-go-1.9.3
...
Bump Go to 1.9.3
2018-01-24 17:34:05 -05:00