Commit Graph

4990 Commits

Author SHA1 Message Date
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
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
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
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