3443bd57ad
Merge pull request #862 from dnephin/fix-vendor-validation
...
Fix vendor validation (and vendor)
Upstream-commit: 0c80cafe78
2018-02-02 15:34:09 -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
d25b4a3533
Merge pull request #859 from mistyhacks/quotes-around-format-strings
...
Add quotes around format template
Upstream-commit: 5bf0d76494
2018-01-31 21:40:08 -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
d30180eaf5
Merge pull request #857 from mistyhacks/5759_typo-in-builder
...
Fix doubled word in note
Upstream-commit: 3aac740478
2018-01-31 14:51:37 -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
275df9bb2d
Merge pull request #852 from thaJeztah/bump-version-18.03
...
Bump VERSION to 18.03.0-dev
Upstream-commit: 4a03f2a4ae
2018-01-31 10:21:54 -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
30a8f2b39f
Merge pull request #849 from mistyhacks/add-filter-label-example
...
Add examples of prune by label
Upstream-commit: 0aabbb09b6
2018-01-30 13:52:34 -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
f6b5291c4c
Merge pull request #844 from tophj-ibm/bump-to-go-1-9-3
...
Bump Go to 1.9.3 (cont.)
Upstream-commit: 7da324a2f6
2018-01-29 16:17:28 -05: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
0093346692
Merge pull request #831 from silvin-lubecki/fix-kubernetes-flags
...
Fix broken Kubernetes stack flags
Upstream-commit: f9039fe291
2018-01-24 10:45:45 -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
8c17001e4f
Merge pull request #826 from dnephin/fix-lint-errors
...
Fix lint on master
Upstream-commit: f2529443a0
2018-01-22 15:16:38 -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
46bc3ffbc5
Merge pull request #817 from vdemeester/make-manifest-cmd-experimental
...
Mark docker-manifest command as experimental (cli)
Upstream-commit: da86425e9f
2018-01-18 17:46:15 -05: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
3e6e651fda
Merge pull request #814 from dnephin/fix-builder-env-docs
...
Improve builder ENV docs
Upstream-commit: 4f550018bb
2018-01-17 23:26:42 +01: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
01a3b0d1ac
Merge pull request #812 from thaJeztah/fix-builder-quote
...
Fix stray quote in builder.md
Upstream-commit: 44094b5219
2018-01-16 23:15:18 +01: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
35c47edb0e
Merge pull request #808 from ethan-haynes/698-tmpfs-mode-compose
...
added support for tmpfs-mode in compose file
Upstream-commit: 14c62f655a
2018-01-16 20:59:17 +01:00
fd6c5edde8
Merge pull request #755 from kolyshkin/wait
...
Show container wait error
Upstream-commit: 1620538c49
2018-01-16 14:40:36 -05:00
