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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
aea7a7fc73
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 >
Upstream-commit: 2b17f4c8a8
2018-01-29 11:08:54 -08:00
33c438d7c6
Bump Go to 1.9.3
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: d89f5fa731
2018-01-29 13:43:59 -05:00
8f3ae07b6b
Merge pull request #717 from albers/completion-images-2
...
Improve and fix bash completion for images
Upstream-commit: 4586609f71
2018-01-27 17:48:49 -08:00
37f71b34b7
Merge pull request #804 from thaJeztah/more-annotations
...
Annotate "stack" commands to be "swarm" and "kubernetes"
Upstream-commit: a46fa0759d
2018-01-26 15:12:09 -05:00
5338e07ad9
Merge pull request #829 from thaJeztah/bump-moby
...
Bump moby and dependencies
Upstream-commit: 44e93ddd13
2018-01-26 10:42:14 -08:00
0532f832be
Merge pull request #827 from thaJeztah/bump-go-1.9.3
...
Bump Go to 1.9.3
Upstream-commit: 819df0ebf6
2018-01-24 17:34:05 -05:00
077b817634
Bump Go to 1.9.3
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ffc7648322
2018-01-24 14:25:13 -08:00
4c8a9a1b98
Using Flags instead of PersistentFlags, as Kubernetes flags seem not to be defined in the "persistent space".
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 14fcadffb1
2018-01-24 09:17:08 -08:00
62d42837f0
bump swarmkit to 713d79dc8799b33465c58ed120b870c52eb5eb4f
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a6a51aadcb
2018-01-24 02:13:53 -08:00
6e37587f1a
Update runc and image-spec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8707bde082
2018-01-24 02:10:17 -08:00
dda53861be
Bump go-winio to 0.4.6
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2bf989e129
2018-01-24 02:04:09 -08:00
b5099bad79
Bump moby/moby to e11bf870a3170a1d2b1e177a0d7ccc66200bd643
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a3be7a6720
2018-01-24 02:01:24 -08:00
2b99ce1d23
Merge pull request #816 from dnephin/binary-native
...
Add dockerfile for building on non-amd64 platforms
Upstream-commit: b6a628c295
2018-01-22 16:14:23 -08:00
fe9a519a3b
Annotate "stack" commands to be "swarm" and "kubernetes"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 93c36eb228
2018-01-22 15:44:47 -08:00
bc95dc9fb3
Fix merge conflict
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ae03b006a6
2018-01-22 18:09:47 -05:00
e3d68b9fea
Merge pull request #780 from thaJeztah/fix-network-add
...
Fix --network-add adding duplicate networks
Upstream-commit: fbb9de2cfc
2018-01-22 14:45:58 -08:00
d093175f6e
Merge pull request #696 from mlaventure/attach-use-containerwait
...
attach: Use ContainerWait instead of Inspect
Upstream-commit: 44a1168ae5
2018-01-20 23:55:16 +01:00
ac28efa249
Mark docker-manifest command as experimental (cli)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2d29732f40
2018-01-18 13:19:33 -08:00
e94c45a5c9
Merge pull request #138 from clnperez/manifest-cmd
...
Add manifest command
Upstream-commit: 11dfa23a5d
2018-01-18 22:15:49 +01:00
3fa889eb3f
Add dockerfile for building on non-amd64 platforms
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 02ca1c8573
2018-01-18 13:16:58 -05:00
dc08aa82a2
add manifest cmd cli doc
...
Signed-off-by: Christy Norman Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 6c6ce22447
2018-01-18 10:53:09 -06:00
33df5a9f66
Update buidler ENV docs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 01b521c002
2018-01-17 16:55:07 -05:00
837b878f9d
Merge pull request #581 from thaJeztah/better-port-range-printing
...
Improve presentation of published port ranges
Upstream-commit: fab4762941
2018-01-16 17:16:45 -05:00
42cf4bc867
Fix stray quote in builder.md
...
Signed-off-by: Taylor Brown <taylorb@microsoft.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 90cfa01889
2018-01-16 22:51:57 +01:00
