Commit Graph

41583 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
a72ff16223 Merge component 'engine' from git@github.com:docker/engine master 2018-06-30 17:07:08 +00:00
0be5385ac6 Merge component 'cli' from git@github.com:docker/cli master 2018-06-30 16:41:41 +00:00
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
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
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
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
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
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
2e0dedd096 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-06-29 17:08:25 +00:00
05e8c9ea29 Merge component 'engine' from git@github.com:docker/engine master 2018-06-29 17:08:17 +00:00
e74f89f95a Merge component 'cli' from git@github.com:docker/cli master 2018-06-29 16:41:45 +00:00
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
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
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
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
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
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
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
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
90d240e1f6 Merge pull request #1159 from albers/completion-events-exec_die
Add bash completion for `exec_die` event
Upstream-commit: fe7ec42566
Component: cli
2018-06-29 11:47:58 +02:00
312f1fe0aa Add bash completion for exec_die event
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8443982188
Component: cli
2018-06-29 11:20:23 +02:00
ee38cae4b8 Add bash completion for dockerd --default-address-pool
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e6d9dfe85
Component: cli
2018-06-29 11:11:24 +02:00
d8b529a6bf Merge pull request #37364 from thaJeztah/bump_go_winio
Update Microsoft/go-winio to 0.4.8
Upstream-commit: 26becc002c406082a29f27462d322aee1162ab22
Component: engine
2018-06-29 09:01:13 +02:00
70dcc9b7b6 LCOW: Prefer Windows over Linux in a manifest list
When a manifest list contains both Linux and Windows images, always
prefer Windows when the platform OS is unspecified. Also, filter out any
Windows images with a higher build than the host, since they cannot run.

Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: ddcdb7255d960a4b2049439245a4f887b26af891
Component: engine
2018-06-28 20:30:41 -07:00
0f65f24d01 Register OCI image media types
OCI types are backwards compatible with Docker manifest
types, however the media types must be registered.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: c4f0515837b834ec66ec463d92a32015062a0804
Component: engine
2018-06-28 18:19:15 -07:00
b02499f190 Fix manifest lists to always use correct size
Stores complete OCI descriptor instead of digest and platform
fields. This includes the size which was getting lost by not
storing the original manifest bytes.

Attempt to support existing cached files, if not output
the filename with the incorrect content.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 1fd2d66df8
Component: cli
2018-06-28 18:17:38 -07:00
e6f427396a Merge pull request #37156 from cpuguy83/networking_api_types_only
Move network conversions out of API router
Upstream-commit: d912e9460e287238f879de791595193543ab2202
Component: engine
2018-06-29 02:47:27 +02:00
51cfefca93 Merge pull request #115 from seemethere/remove
Remove Debian Jessie for arm64
Upstream-commit: 4f79760ebf3d659be670d5079574b3fc199f14a0
Component: packaging
2018-06-28 15:49:32 -07:00
b31e4cd2ef added unit tests to cover plugin list command
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: c26121df5c
Component: cli
2018-06-28 16:51:54 -04:00
0cd9d46d0f Merge component 'engine' from git@github.com:docker/engine master 2018-06-28 17:07:34 +00:00
f83b2543cd Update Microsoft/go-winio to 0.4.8
Fixes named pipe support for hyper-v isolated containers

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 74095588baa0693a2c07bd05c001c42830f82ed3
Component: engine
2018-06-28 18:55:45 +02:00
859289c11a Merge component 'cli' from git@github.com:docker/cli master 2018-06-28 16:41:43 +00:00
06b2959259 Merge pull request #1154 from thaJeztah/bump_version_18.07_dev
Bump version to 18.07.0-dev
Upstream-commit: ea65e9043c
Component: cli
2018-06-28 16:24:08 +02:00
db488c0706 Remove Debian Jessie for arm64
It's not longer supported since Debian Jessie is now an LTS release as
of June 17, 2018. LTS releases of Debian only support i386, amd64, armel and armhf

Sources:
* https://wiki.debian.org/LTS
* https://wiki.debian.org/LTS/FAQ

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 24f8b422aaed0fba9d0f03bfd5b99c58f0d7f30d
Component: packaging
2018-06-28 13:46:30 +00:00
644d6fd60f Bump version to 18.07.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f1fa1f3f15
Component: cli
2018-06-28 15:44:15 +02:00
4efabde589 Merge pull request #1151 from vdemeester/update-docker-credential-helper-pass
Update docker-credential-helpers dependency
Upstream-commit: 293553944d
Component: cli
2018-06-28 14:57:05 +02:00
539051208f Update docker-credential-helpers dependency
This is mainly for the `pass` helper ; `pass` shouldn't be called
every docker command anymore ;).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d9741fc96b
Component: cli
2018-06-28 14:44:53 +02:00
b3ce456eca Merge pull request #37356 from Microsoft/jjh/new37316
LCOW: lazycontext: Use correct lstat, fix archive check
Upstream-commit: 1d7132e3d2d91168153db529b8900fb6e53aea92
Component: engine
2018-06-28 12:32:31 +02:00