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
Sebastiaan van Stijn
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
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
Daniel Nephin
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
Vincent Demeester
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
Christopher Jones
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
Sebastiaan van Stijn
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
Daniel Nephin
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
Vincent Demeester
5338e07ad9
Merge pull request #829 from thaJeztah/bump-moby
...
Bump moby and dependencies
Upstream-commit: 44e93ddd13
2018-01-26 10:42:14 -08:00
Daniel Nephin
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Silvin Lubecki
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Daniel Nephin
bc95dc9fb3
Fix merge conflict
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ae03b006a6
2018-01-22 18:09:47 -05:00
Vincent Demeester
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
Sebastiaan van Stijn
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
Brian Goff
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
Vincent Demeester
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
Vincent Demeester
e94c45a5c9
Merge pull request #138 from clnperez/manifest-cmd
...
Add manifest command
Upstream-commit: 11dfa23a5d
2018-01-18 22:15:49 +01:00
Daniel Nephin
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
Christy Perez
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
Sebastiaan van Stijn
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
Daniel Nephin
33df5a9f66
Update buidler ENV docs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 01b521c002
2018-01-17 16:55:07 -05:00
Daniel Nephin
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Daniel Nephin
fd6c5edde8
Merge pull request #755 from kolyshkin/wait
...
Show container wait error
Upstream-commit: 1620538c49
2018-01-16 14:40:36 -05:00
Kir Kolyshkin
fcc2e6e315
container.waitExitOrRemoved(): add a test case
...
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 85ddaee5af
2018-01-16 10:16:28 -08:00
Ethan Haynes
96cd62f939
added support for tmpfs-mode in compose file
...
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu >
Upstream-commit: cd69d082ea
2018-01-16 10:52:26 -06:00
Ethan Haynes
6480a738eb
adding tmpfs field to the compose 3.6v file spec and updating binary
...
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu >
Upstream-commit: b15362ce32
2018-01-16 10:50:40 -06:00
Ethan Haynes
596eb2d73f
adding config_schema_v3.6.json and updating binary
...
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu >
Upstream-commit: 2b8cc52409
2018-01-16 10:44:08 -06:00
Sebastiaan van Stijn
9ec0657065
Merge pull request #810 from akimd/rmi-eol
...
Remove: add missing eol when --force is passed
Upstream-commit: 3a69e5d265
2018-01-16 10:29:46 +01:00
Akim Demaille
c4ee004968
Remove: add missing eol when --force is passed
...
Signed-off-by: Akim Demaille <akim.demaille@docker.com >
Upstream-commit: f83aa7b705
2018-01-16 09:29:53 +01:00
Vincent Demeester
6303353f60
Merge pull request #807 from thaJeztah/golint-fixes
...
golint: remove redundant ifs
Upstream-commit: 1694921047
2018-01-13 14:55:14 +01:00
Sebastiaan van Stijn
4db79d6583
golint: remove redundant ifs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d845b4d36a
2018-01-13 13:16:34 +01:00
Vincent Demeester
2539b89332
Merge pull request #803 from thaJeztah/remove-orchestrator-aliases
...
Remove aliases for orchestrator
Upstream-commit: b7b3e9a261
2018-01-12 08:59:52 +01:00
Sebastiaan van Stijn
5127f79a88
Remove aliases for orchestrator
...
Prefer "strict" values for orchestrator, as it's
easier to add aliases (if we think it's needed) than
to remove them later.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a812995f98
2018-01-11 21:16:37 +01:00
Sebastiaan van Stijn
cfd3975d5f
Merge pull request #802 from thaJeztah/fix-yaml-generation
...
Fix docs YAML generation setting "kubernetes" for "swarm"
Upstream-commit: 41368a84bb
2018-01-11 19:56:36 +01:00
Sebastiaan van Stijn
3e7d4bee2e
Fix docs YAML generation setting "kubernetes" for "swarm"
...
Due to a copy/paste error, commands annotated with "swarm"
were incorrectly setting the "kubernetes" property.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6be06a3db2
2018-01-11 18:30:50 +01:00
