Commit Graph
41501 Commits
Author SHA1 Message Date
GordonTheTurtle 06dc7cf0b2 Merge component 'cli' from git@github.com:docker/cli master 2018-07-05 16:41:46 +00:00
Silvin 76a7769a26 Merge pull request #1163 from thaJeztah/bump_engine
bump docker and dependencies
Upstream-commit: f285fe67e9
Component: cli
2018-07-04 16:17:12 +02:00
Sebastiaan van Stijn f9fb05a1c6 Bump docker and dependencies
Updates docker/docker to 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d,
matching 18.06.0-rc1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5f6d5c7328
Component: cli
2018-07-04 01:14:40 +00:00
GordonTheTurtle 6cd83dd22a Merge component 'engine' from git@github.com:docker/engine master 2018-07-03 23:43:12 +00:00
Sebastiaan van Stijn a72fa5b176 Merge pull request #1186 from tiborvass/buildkit-envvar-zero
build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
Upstream-commit: bded5beb78
Component: cli
2018-07-04 01:28:03 +02:00
GordonTheTurtle 353f747d00 Merge component 'cli' from git@github.com:docker/cli master 2018-07-03 23:18:49 +00:00
Tibor Vass 8206a70295 build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 721000e6c9
Component: cli
2018-07-03 23:14:06 +00:00
Tibor Vass 106b7430c8 Merge pull request #1176 from tiborvass/buildkit-iidfile
build: --iidfile support with buildkit
Upstream-commit: 7b255e653a
Component: cli
2018-07-03 15:36:23 -07:00
Tibor Vass 9a3e0745ac build: --iidfile support with buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c7e85c09d2
Component: cli
2018-07-03 19:11:11 +00:00
Tõnis Tiigi 0f426dddd4 Merge pull request #1156 from dmcgowan/fix-manifest-list-size
Fix manifest lists to always use correct size
Upstream-commit: 69e1743e3d
Component: cli
2018-07-03 11:27:19 -07:00
Sebastiaan van Stijn 5f211d1a2a Merge pull request #37242 from nvcastet/fix_sys_nice_seccomp
Whitelist syscalls linked to CAP_SYS_NICE in default seccomp profile
Upstream-commit: 6273dffbda8928327e8576dc58639edc09fd9c09
Component: engine
2018-07-03 19:23:07 +02:00
Sebastiaan van Stijn ff4ddbf44b Merge pull request #37371 from ctelfer/bump-libnw-430c00a
bump libnetwork to 430c00a
Upstream-commit: dca4cab55d501949b71c58cbd76452e6acfa9243
Component: engine
2018-07-03 19:09:41 +02:00
GordonTheTurtle 49fe8b5ca2 Merge component 'engine' from git@github.com:docker/engine master 2018-07-03 17:08:04 +00:00
Sebastiaan van Stijn 02405253ed Merge pull request #37379 from yui-knk/fix_add_command_doc
Update documents of `dispatchAdd`
Upstream-commit: e54bbc0326608ee07c30062c24ebe7dc337407e1
Component: engine
2018-07-03 08:37:57 +02:00
Yuichiro Kaneko bd47f635c0 Update documents of dispatchAdd
`ADD` does not support git.

Ref: https://github.com/moby/moby/issues/14704#issuecomment-298134333

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
Upstream-commit: 9b374801ac843c3401bfb21d8fd5e205d0bba0d3
Component: engine
2018-07-03 08:51:07 +09:00
GordonTheTurtle 874373ffa1 Merge component 'engine' from git@github.com:docker/engine master 2018-07-02 17:07:15 +00:00
GordonTheTurtle 98b57eb113 Merge component 'cli' from git@github.com:docker/cli master 2018-07-02 16:41:41 +00:00
Vincent Demeester 58cb4233e4 Merge pull request #1175 from vdemeester/bump-k8s
Bump kubernetes dependencies to 1.8.14
Upstream-commit: f5393c904a
Component: cli
2018-07-02 17:12:35 +02:00
Vincent Demeester f3c0910062 Bump kubernetes dependencies to 1.8.14
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b59c41b2a7
Component: cli
2018-07-02 16:32:07 +02:00
Sebastiaan van Stijn 13348b3c97 Merge pull request #1172 from vdemeester/no-need-to-check-files
Remove composefiles length check on k8s RunDeploy
Upstream-commit: 95a9b4d5fe
Component: cli
2018-07-02 15:06:50 +02:00
Vincent Demeester 779f6f7f88 Remove composefiles lenght check on k8s RunDeploy..
The compose file(s) are already loaded at that point.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 847e0c22d4
Component: cli
2018-07-02 15:00:19 +02:00
Sebastiaan van Stijn a01b362aaa Merge pull request #1171 from silvin-lubecki/fix-doc-typo
Fix Format example typo"
Upstream-commit: a2b4d30cd0
Component: cli
2018-07-02 14:47:39 +02:00
Vincent Demeester a7495f07aa Merge pull request #37359 from dmcgowan/register-oci-mediatypes
Register OCI media types
Upstream-commit: b0e6eedcf4252d56e62fc3de6de5d01e75a3dc44
Component: engine
2018-07-02 14:26:36 +02:00
Silvin Lubecki 15af5c3d50 Fixing issue #1167 "Format example typo"
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: d0ddf91539
Component: cli
2018-07-02 14:21:10 +02:00
Silvin d6559c14df Merge pull request #1170 from vdemeester/omit-silvin
Add omitempty on compose config top-level types
Upstream-commit: 18091ea7e2
Component: cli
2018-07-02 14:16:53 +02:00
Vincent Demeester 8d5faaab34 Add omitempty on compose config top-level types
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f05ab2b1fb
Component: cli
2018-07-02 12:04:09 +02:00
Vincent Demeester 88306c7201 Merge pull request #1169 from silvin-lubecki/schema-vendoring
Add a doc.go file so the compose/schema/data directory can be vendore…
Upstream-commit: 981c099b96
Component: cli
2018-07-02 10:47:25 +02:00
Sebastiaan van Stijn f23d411358 Merge pull request #1168 from vdemeester/update-testing
Update TESTING.md to replace testify by gotest.tools
Upstream-commit: 1c69e83034
Component: cli
2018-07-02 10:34:28 +02:00
Silvin Lubecki dbc964790c Add a doc.go file so the compose/schema/data directory can be vendored in another project, without being pruned.
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 3a8ef767f8
Component: cli
2018-07-02 10:08:25 +02:00
Vincent Demeester 82ffaa807c Merge pull request #1160 from euank/simpler-pass
config/credentials: don't run 'pass' to detect it
Upstream-commit: 9e36ff4491
Component: cli
2018-07-02 09:40:47 +02:00
Vincent Demeester 2d117d02fc Update TESTING.md to replace testify by gotest.tools
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 057bf6f4d1
Component: cli
2018-07-02 09:24:28 +02:00
GordonTheTurtle a72ff16223 Merge component 'engine' from git@github.com:docker/engine master 2018-06-30 17:07:08 +00:00
GordonTheTurtle 0be5385ac6 Merge component 'cli' from git@github.com:docker/cli master 2018-06-30 16:41:41 +00:00
Sebastiaan van Stijn 05cd9e777a Merge pull request #37374 from haikuoliu/branch_endpoint
Pass endpoint to the CloudWatch Logs logging driver
Upstream-commit: 8d1b280a2544c4692b72f80a4265102e111743a4
Component: engine
2018-06-30 11:22:55 +02:00
Chris Telfer 08169a61e4 Update tests w/ new libnetwork contraints
The TestDockerNetworkIPAMMultipleNetworks test allocates several
networks simultaneously with overlapping IP addresses.  Libnetwork now
forbids this.  Adjust the test case to use distinct IP ranges for the
networks it creates.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
Upstream-commit: efb7909befa0fe2236148543a6d50e2563bf386c
Component: engine
2018-06-29 15:15:52 -04:00
Sebastiaan van Stijn 449c60abf1 Merge pull request #1157 from AzureCR/master
Updated the go-winio library to release 0.4.8 that has the fix for Windows Container
Upstream-commit: 34ba66b0c5
Component: cli
2018-06-29 21:11:53 +02:00
Euan Kemp a4509c02c7 config/credentials: don't run 'pass' to detect it
'CheckInitialized' in the credential-helper library actually invokes
`pass`, which isn't desirable (see #699).

This moves the check to be simpler, and then pass will only be invoked
when it's needed (such as for `docker login` or when pulling from a
private registry).

This logic could also reasonably live in the credential-helper library,
but it's simple enough it seems fine in either location.

Signed-off-by: Euan Kemp <euank@euank.com>
Upstream-commit: 056015c3d8
Component: cli
2018-06-29 11:38:39 -07:00
haikuoliu 2e315f18e1 Pass endpoint to the CloudWatch Logs logging driver
Signed-off-by: haikuoliu <haikuo@amazon.com>
Upstream-commit: 998478d369ad3784c3cd28038d836c3c94b16936
Component: engine
2018-06-29 11:27:37 -07:00
Tejaswini Duggaraju 00a2e2286e Updated the go-winio library to release 0.4.8 that has the fix for Windows containers
Signed-off-by: Tejaswini Duggaraju <naduggar@microsoft.com>
Upstream-commit: c98c4080a3
Component: cli
2018-06-29 10:49:52 -07:00
GordonTheTurtle 2e0dedd096 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-06-29 17:08:25 +00:00
GordonTheTurtle 05e8c9ea29 Merge component 'engine' from git@github.com:docker/engine master 2018-06-29 17:08:17 +00:00
GordonTheTurtle e74f89f95a Merge component 'cli' from git@github.com:docker/cli master 2018-06-29 16:41:45 +00:00
John Howard 5ed5d1d659 Merge pull request #37369 from johnstep/update-windows-manifest-sorting
LCOW: Prefer Windows over Linux in a manifest list
Upstream-commit: a2a3b8fe9cb8a3c9afc11ce27eadebcdb8b40ee5
Component: engine
2018-06-29 09:19:30 -07:00
Sebastiaan van Stijn 871e21254e Merge pull request #1145 from Vimal-Raghubir/590-Add-missing-option
Add: Add missing option
Upstream-commit: da59ccb601
Component: cli
2018-06-29 17:16:25 +02:00
Chris Telfer 51cfb2a768 bump libnetwork to 430c00a
Bump libnetwork to 430c00a6a6b3dfdd774f21e1abd4ad6b0216c629.  This
includes the following moby-affecting changes:

 * Update vendoring for go-sockaddr (8df9f31a)
 * Fix inconsistent subnet allocation by preventing allocation of
   overlapping subnets (8579c5d2)
 * Handle IPv6 literals correctly in port bindings (474fcaf4)
 * Update vendoring for miekg/dns (8f307ac8)
 * Avoid subnet reallocation until required (9756ff7ed)
 * Bump libnetwork build to use go version 1.10.2 (603d2c1a)
 * Unwrap error type returned by PluginGetter (aacec8e1)
 * Update vendored components to match moby (d768021dd)
 * Add retry field to cluster-peers probe (dbbd06a7)
 * Fix net driver response loss on createEndpoint (1ab6e506)
   (fixes https://github.com/docker/for-linux/issues/348)

Signed-off-by: Chris Telfer <ctelfer@docker.com>
Upstream-commit: f155f828a26cfb3ee0dd8ca48bd2c702c9032b0b
Component: engine
2018-06-29 11:03:20 -04:00
Sebastiaan van Stijn ab5a818454 Merge pull request #37370 from albers/custom-bashrc
Re-add support for a custom .bashrc file in build env
Upstream-commit: 7f3aeb84320a90a9a83672630b75e5e962e82489
Component: engine
2018-06-29 16:37:17 +02:00
Vincent Demeester a60dc52c9f Merge pull request #1155 from adshmh/add-unit-tests-to-plugin-list
added unit tests to cover plugin list command
Upstream-commit: 9faf728089
Component: cli
2018-06-29 15:49:30 +02:00
Sebastiaan van Stijn f354e71da3 Merge pull request #1152 from vdemeester/extract-converter
Extract StackConverter from the StackClient
Upstream-commit: 7c7c299eee
Component: cli
2018-06-29 13:36:55 +02:00
Harald Albers adf7112b0e Re-add support for a custom .bashrc file in build env
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f2c5857612309330a559500181ce454309ae3c1c
Component: engine
2018-06-29 12:39:36 +02:00
Sebastiaan van Stijn 74cbabea8f Merge pull request #1158 from albers/completion-dockerd--default-address-pool
Add bash completion for `dockerd --default-address-pool`
Upstream-commit: 3991b2fae3
Component: cli
2018-06-29 11:48:43 +02:00