98b57eb113
Merge component 'cli' from git@github.com:docker/cli master
2018-07-02 16:41:41 +00:00
f3c0910062
Bump kubernetes dependencies to 1.8.14
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b59c41b2a7
2018-07-02 16:32:07 +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
2018-07-02 15:00:19 +02:00
15af5c3d50
Fixing issue #1167 "Format example typo"
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: d0ddf91539
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
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
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
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
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
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
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
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
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
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
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
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
2018-06-29 17:16:25 +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
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
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
2018-06-29 11:48:43 +02:00
312f1fe0aa
Add bash completion for exec_die event
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8443982188
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
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
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
b31e4cd2ef
added unit tests to cover plugin list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: c26121df5c
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
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
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
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
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
b13ea5551c
Merge component 'engine' from git@github.com:docker/engine master
2018-06-28 03:56:28 +00:00
2ae84e99a1
Merge pull request #37357 from dmcgowan/update-containerd-1.1.1-rc.2
...
Update containerd to v1.1.1-rc.2
Upstream-commit: 37079d66c65d78da66b963315c9102ce67a1d685
Component: engine
2018-06-28 12:41:05 +09:00
3f6be54aa7
Merge component 'engine' from git@github.com:docker/engine master
2018-06-28 02:53:18 +00:00
b30a6b365b
Merge pull request #37350 from tonistiigi/platform-support
...
Fix platform struct passing
Upstream-commit: 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d
Component: engine
2018-06-27 19:23:27 -07:00
efa9f9914b
added unit tests covering content trust for plugin install command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: bc9b42ea9b
2018-06-27 22:16:19 -04:00
d86ac0bd5d
Move network conversions out of API router
...
This stuff doesn't belong here and is causing imports of libnetwork into
the router, which is not what we want.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c0bc14e8dd5a31f5edc804e9a1347bb3eb44483e
Component: engine
2018-06-27 17:11:29 -07:00
1a09169ca0
distribution: remove custom matcher code
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 951faaed664dd51d2aacfdb782534f4c46bd9e23
Component: engine
2018-06-27 15:33:07 -07:00
d2c785277a
system: add back lcow validation function
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f0997716651b6e6c2b07e3d514bf8452114a1433
Component: engine
2018-06-27 15:24:26 -07:00
c377af1d4d
builder: update platform support to puller
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0b50d6c315a41025de98617bd6cc79c3925838d5
Component: engine
2018-06-27 14:59:36 -07:00
