Commit Graph

4967 Commits

Author SHA1 Message Date
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
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
Sebastiaan van Stijn ffc7648322
Bump Go to 1.9.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 14:25:13 -08:00
Sebastiaan van Stijn f9039fe291
Merge pull request #831 from silvin-lubecki/fix-kubernetes-flags
Fix broken Kubernetes stack flags
2018-01-24 10:45:45 -08:00
Silvin Lubecki 14fcadffb1 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>
2018-01-24 09:17:08 -08:00
Sebastiaan van Stijn a6a51aadcb
bump swarmkit to 713d79dc8799b33465c58ed120b870c52eb5eb4f
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:13:53 -08:00
Sebastiaan van Stijn 8707bde082
Update runc and image-spec
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:10:17 -08:00
Sebastiaan van Stijn 2bf989e129
Bump go-winio to 0.4.6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:04:09 -08:00
Sebastiaan van Stijn a3be7a6720
Bump moby/moby to e11bf870a3170a1d2b1e177a0d7ccc66200bd643
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-24 02:01:24 -08:00
Sebastiaan van Stijn b6a628c295
Merge pull request #816 from dnephin/binary-native
Add dockerfile for building on non-amd64 platforms
2018-01-22 16:14:23 -08:00
Sebastiaan van Stijn 93c36eb228
Annotate "stack" commands to be "swarm" and "kubernetes"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-22 15:44:47 -08:00
Sebastiaan van Stijn f2529443a0
Merge pull request #826 from dnephin/fix-lint-errors
Fix lint on master
2018-01-22 15:16:38 -08:00
Daniel Nephin ae03b006a6 Fix merge conflict
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-01-22 18:09:47 -05:00
Vincent Demeester fbb9de2cfc
Merge pull request #780 from thaJeztah/fix-network-add
Fix --network-add adding duplicate networks
2018-01-22 14:45:58 -08:00
Sebastiaan van Stijn 44a1168ae5
Merge pull request #696 from mlaventure/attach-use-containerwait
attach: Use ContainerWait instead of Inspect
2018-01-20 23:55:16 +01:00
Brian Goff da86425e9f
Merge pull request #817 from vdemeester/make-manifest-cmd-experimental
Mark docker-manifest command as experimental (cli)
2018-01-18 17:46:15 -05:00
Vincent Demeester 2d29732f40
Mark docker-manifest command as experimental (cli)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-01-18 13:19:33 -08:00
Vincent Demeester 11dfa23a5d
Merge pull request #138 from clnperez/manifest-cmd
Add manifest command
2018-01-18 22:15:49 +01:00
Daniel Nephin 02ca1c8573 Add dockerfile for building on non-amd64 platforms
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-01-18 13:16:58 -05:00
Christy Perez 6c6ce22447 add manifest cmd cli doc
Signed-off-by: Christy Norman Perez <christy@linux.vnet.ibm.com>
2018-01-18 10:53:09 -06:00
Sebastiaan van Stijn 4f550018bb
Merge pull request #814 from dnephin/fix-builder-env-docs
Improve builder ENV docs
2018-01-17 23:26:42 +01:00
Daniel Nephin 01b521c002 Update buidler ENV docs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-01-17 16:55:07 -05:00
Daniel Nephin fab4762941
Merge pull request #581 from thaJeztah/better-port-range-printing
Improve presentation of published port ranges
2018-01-16 17:16:45 -05:00
Sebastiaan van Stijn 44094b5219
Merge pull request #812 from thaJeztah/fix-builder-quote
Fix stray quote in builder.md
2018-01-16 23:15:18 +01:00
Sebastiaan van Stijn 90cfa01889
Fix stray quote in builder.md
Signed-off-by: Taylor Brown <taylorb@microsoft.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-16 22:51:57 +01:00
Sebastiaan van Stijn 14c62f655a
Merge pull request #808 from ethan-haynes/698-tmpfs-mode-compose
added support for tmpfs-mode in compose file
2018-01-16 20:59:17 +01:00
Daniel Nephin 1620538c49
Merge pull request #755 from kolyshkin/wait
Show container wait error
2018-01-16 14:40:36 -05:00
Kir Kolyshkin 85ddaee5af container.waitExitOrRemoved(): add a test case
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2018-01-16 10:16:28 -08:00
Ethan Haynes cd69d082ea added support for tmpfs-mode in compose file
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
2018-01-16 10:52:26 -06:00
Ethan Haynes b15362ce32 adding tmpfs field to the compose 3.6v file spec and updating binary
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
2018-01-16 10:50:40 -06:00
Ethan Haynes 2b8cc52409 adding config_schema_v3.6.json and updating binary
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
2018-01-16 10:44:08 -06:00
Sebastiaan van Stijn 3a69e5d265
Merge pull request #810 from akimd/rmi-eol
Remove: add missing eol when --force is passed
2018-01-16 10:29:46 +01:00
Akim Demaille f83aa7b705 Remove: add missing eol when --force is passed
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-01-16 09:29:53 +01:00
Vincent Demeester 1694921047
Merge pull request #807 from thaJeztah/golint-fixes
golint: remove redundant ifs
2018-01-13 14:55:14 +01:00
Sebastiaan van Stijn d845b4d36a
golint: remove redundant ifs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-13 13:16:34 +01:00
Vincent Demeester b7b3e9a261
Merge pull request #803 from thaJeztah/remove-orchestrator-aliases
Remove aliases for orchestrator
2018-01-12 08:59:52 +01:00
Sebastiaan van Stijn a812995f98
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>
2018-01-11 21:16:37 +01:00
Sebastiaan van Stijn 41368a84bb
Merge pull request #802 from thaJeztah/fix-yaml-generation
Fix docs YAML generation setting "kubernetes" for "swarm"
2018-01-11 19:56:36 +01:00
Sebastiaan van Stijn 6be06a3db2
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>
2018-01-11 18:30:50 +01:00