e59c1e2d2f
add trailing slash
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0f379fab3195f70f8e565d1deab6051828254a6e
Component: engine
2016-01-25 09:01:46 -08:00
285dba59c1
Windows CI: In container logic flaw
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5601fc8507d9edb4eb764b7337866ea04f44be54
Component: engine
2016-01-24 09:22:50 -08:00
bfaa6f239b
Fixes #19614
...
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
Upstream-commit: 0c7201ee736f77e63cd1f191dfd6a3cf549b6def
Component: engine
2016-01-24 10:28:18 +01:00
dd594705a0
Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer
...
Hotfix vendor libcontainer
Upstream-commit: 6d1455e74b388faeae0f90379b8aa908afed0bf7
Component: engine
2016-01-22 16:46:04 -08:00
fba580f28b
Merge pull request #19146 from mikedougherty/cs-105-download-script
...
Create a bundle for the install script to support other domains
Upstream-commit: 21ec6d3789b93aad5788785cf4be4a2445044375
Component: engine
2016-01-22 09:25:24 -08:00
17026542ae
Merge pull request #19573 from sanimej/libn
...
Vendor in libnetwork v0.6.0-rc2
Upstream-commit: a9fc4939dfd864bc2ab2c9bc1dc0211feb03ec65
Component: engine
2016-01-22 12:07:40 -05:00
4b43f56b91
Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm
...
Enable DockerTrustSuite for ARM again
Upstream-commit: cba7ba25f4358c86aee4872186d9dfd2fc3dc0fd
Component: engine
2016-01-22 11:23:19 -05:00
2aed85b059
vendor: *: update libcontainer
...
This fixes a security vulnerability in Docker, which can cause a DoS
under certain circumstances. This is from the hotfix branch, so the
vendored commit is actually bf899fef451956be4abd63de6d6141d9f9096a02 in
runc master.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: 40b5eebb0b8f34cb3f6a3e6a83cac1b3a34a1d29
Component: engine
2016-01-22 20:15:09 +11:00
0704f515fb
Vendor in libnetwork v0.6.0-rc2
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 02c9d48144c0523d59fe4ba1c0b645c17fd05f80
Component: engine
2016-01-21 20:46:28 -08:00
d0c4b1bf31
Create a bundle for the install script to support other domains
...
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.
This install script is used in to change the URLs instead of sed in
release.sh.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com >
Upstream-commit: 51dad1185a8dcf55f2e3473b79748e0e72c6590c
Component: engine
2016-01-21 20:42:20 -08:00
a7b9f6d573
Merge pull request #19316 from Microsoft/jjh/incontainererror
...
Windows: In container build check
Upstream-commit: e287bef453f2b4419a26e9bfa94987f13aa8376f
Component: engine
2016-01-21 13:44:19 -08:00
9b2be4c8e0
Merge pull request #19552 from aaronlehmann/vendor-distribution-3
...
Vendor updated distribution package
Upstream-commit: 3ecba7089be0fec32ab46f3bf55deb7878562b6d
Component: engine
2016-01-21 16:21:59 -05:00
fb1bb8a419
Windows: In container build check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4dbd612d474317fdd7bd983f2d1a05654c2ceaad
Component: engine
2016-01-21 13:15:23 -08:00
e43ee5b6f8
Vendor updated distribution package
...
Another day, another revendor.
This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.
Fixes #19526
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 921eae9d6d028187daff7521740977b07414b631
Component: engine
2016-01-21 11:01:14 -08:00
5f04a8c8b6
Merge pull request #19349 from jfrazelle/add-link-to-wiki
...
add warning if upgrading via script to migrate
Upstream-commit: 5f9375cf390b9a0ea04aba8b6bafa83a8879cb65
Component: engine
2016-01-21 12:51:25 -05:00
128e0a1c5a
Merge pull request #19423 from jfrazelle/apparmor-no-install
...
disable install of docker-engine for 1.10, try to get ready for 1.11
Upstream-commit: 7d19ca7c40bc2b5172854ce073a6d11175027d82
Component: engine
2016-01-21 12:08:50 -05:00
4787976da3
Merge pull request #19522 from aaronlehmann/vendor-distribution-2
...
Vendor updated distribution
Upstream-commit: 8c0dd9d1821fe99fa720de84a4bf96e6fb50f94b
Component: engine
2016-01-21 08:15:41 -08:00
bc39a3fed6
Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
...
Cleanup build rpm deb
Upstream-commit: 5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Component: engine
2016-01-20 23:58:33 -08:00
41247c2b40
Vendor updated distribution
...
The only changes are https://github.com/docker/distribution/pull/1379
and https://github.com/docker/distribution/pull/1380 .
Fixes #19476
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a160dd4987e2508bb93f37741ab82f0e724d3ed7
Component: engine
2016-01-20 15:46:11 -08:00
52842fc3ba
Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles
...
Remove validate-vendor from default bundles
Upstream-commit: c21eb2a4209f6339fe59e4a97c3e6479aeb39f94
Component: engine
2016-01-20 14:29:07 -08:00
88d33e25a1
Merge pull request #19503 from jfrazelle/update-logrus
...
bump logrus
Upstream-commit: 7bddbdf360f50fed07cd21b21270f5f287222d8c
Component: engine
2016-01-20 12:54:49 -08:00
aaa9f64061
Merge pull request #19469 from crosbymichael/libcontainer-resource-hf
...
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
Upstream-commit: bcf155bb7a3cacf8f37e98d41c136eeba3f7775e
Component: engine
2016-01-20 11:31:14 -08:00
d7e4961a40
bump logrus
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 95695aa38caafa6f4cf42f90c2e0fa67c5e36b91
Component: engine
2016-01-20 09:51:09 -08:00
c61a40877b
Remove validate-vendor from default bundles
...
Because it's triggered another way :)
See https://github.com/docker/leeroy/pull/44
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e5bce745925384501422ed61cb69b968187bda0e
Component: engine
2016-01-20 18:29:28 +01:00
6c742b7427
Enable DockerTrustSuite for ARM again
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: acb42c5fabc154609bc2cb6b6b55477371945ac4
Component: engine
2016-01-20 14:58:09 +01:00
2bc66fc26e
Merge pull request #19465 from mavenugo/sysd
...
Vendor libnetwork v0.6.0-rc1
Upstream-commit: 87b7ff52675119aa0ddfdfa789ad5fbf9fdd99b0
Component: engine
2016-01-20 09:02:21 +01:00
af3be96a25
Merge pull request #19466 from aaronlehmann/vendor-distribution
...
Vendor updated docker/distribution package
Upstream-commit: 7657e233f7dae10d8bacbd76460a1e4ca84a7ac7
Component: engine
2016-01-19 21:05:43 -05:00
2a3e0a22a4
add a way to only build requested pkgs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0bff2515f74fc6f0be9f019cc8b0f08b50e36228
Component: engine
2016-01-19 17:47:27 -08:00
16c01aa282
add warning if upgrading via script to migrate
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 60d44d8b80dd693f5163f54293e6857b4fb3bb6a
Component: engine
2016-01-19 15:41:08 -08:00
7331395789
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
...
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5f73ab89523d240c61d8e745bc106232891b46f7
Component: engine
2016-01-19 15:34:08 -08:00
795bea682d
Vendor libnetwork v0.6.0-rc1
...
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
network plugin (https://github.com/docker/libnetwork/issues/813 )
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ee3b42f385cdb41b2996b4b64f4f319adb62ad03
Component: engine
2016-01-19 13:50:17 -08:00
28d6652c84
Vendor updated docker/distribution package
...
Fixes #19400
Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 588e27f9a57cc2e2cdd84f49cf8cb5a7caed467b
Component: engine
2016-01-19 13:28:51 -08:00
d154b3d30f
Fix test requirement for ARM
...
Correctly passes the DOCKER_ENGINE_GOARCH env var
to the testing environment
Also fixes logic for skipping a test if on ARM.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: d12f4babdd08acd3cf64c2ee4a9550c81d534816
Component: engine
2016-01-19 15:23:46 -05:00
6e2509f508
Merge pull request #19426 from sanimej/restart
...
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
Upstream-commit: 011ca5f206ed2ffaf8a7871da4ea44c6d03cafd6
Component: engine
2016-01-19 10:28:33 +01:00
d08e97ec27
Merge pull request #19196 from Microsoft/jjh/tp4ci
...
Windows CI: Setup for testing against Windows
Upstream-commit: 637f49b5af6ac61cce6fadc4a3b8264ec14ca29b
Component: engine
2016-01-18 15:22:08 -08:00
4562635fa9
disable install of docker-engine for 1.10, try to get ready for 1.11
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c4bc9657b9e52f12b37aa36da15c1a2eb86519a3
Component: engine
2016-01-18 13:38:29 -08:00
d22cc489e9
Skip failing tests on ARM to get red/green feedback from Jenkins
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 4f339570cbd3cc57f5410c4ca08c7d7e03e6e56f
Component: engine
2016-01-18 17:00:15 +01:00
1df5742548
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
...
- Fixes the issue of Shutdown() not working, resulting in hung
goroutines
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: bccf653082dababc1827be3aa9976e3100037a80
Component: engine
2016-01-17 08:17:13 -08:00
d8a8275332
Merge pull request #19169 from Djelibeybi/fix-ol6-build
...
Restoring the RPM build process for Oracle Linux 6
Upstream-commit: b69243e951a9845c3bd3e718452865c2753b7a0c
Component: engine
2016-01-15 16:56:11 -08:00
d3d0a35112
Merge pull request #19340 from Microsoft/jjh/rsrcfix
...
Windows: Remove linkmode internal hack
Upstream-commit: 790e648c0613e435be56727e1ebbdc0ccf8aeb56
Component: engine
2016-01-15 14:10:56 -08:00
170652aa2c
Merge pull request #19345 from tianon/fast-syscall-compile
...
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
Upstream-commit: dd104eb91d6e2eeb92467363d75c762ec303ac84
Component: engine
2016-01-15 16:06:14 -05:00
6e02d0f3a0
Merge pull request #19355 from riyazdf/notary-revendor
...
notary revendor into docker
Upstream-commit: 4c89b1f72c1259858e243ddbfb00d74dbafeff8a
Component: engine
2016-01-15 01:02:35 -08:00
9952183b81
revendor notary and wrap friendlier error messages
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: dd7436c832a5dd777d0276c3e3b1819062b86ebc
Component: engine
2016-01-14 20:35:59 -08:00
2365ad5675
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
...
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 9b2aab3fc85ab1d8cf7479b153e54d5dcceb7886
Component: engine
2016-01-14 13:51:30 -08:00
f048e88551
Windows: Remove linkmode internal hack
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6ca5a2c476f548b55d68daa4264b4ef9e6c2696d
Component: engine
2016-01-14 13:09:28 -08:00
bc77bba632
Merge pull request #19338 from aboch/vnd
...
Vendoring libnetwork v0.5.5
Upstream-commit: db2b5e647c8cd5a2dd0d853785f8c3a2fc9cbbfc
Component: engine
2016-01-14 13:02:20 -08:00
b938aebf84
Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog
...
Remove the changelog auto-generation
Upstream-commit: 7a442651292a32316d5ba0bf018f9cf8444e7717
Component: engine
2016-01-14 12:47:32 -08:00
a534cbd465
Vendoring libnetwork v0.5.6
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 5347f7cd947df3e29d777274c9325c9461a1c051
Component: engine
2016-01-14 10:48:48 -08:00
25aab1428e
Merge pull request #18587 from calavera/daemon_configuration_file
...
Allow to set daemon and server configurations in a file.
Upstream-commit: e44364eae90784b423eee8b2969bda9cd2429746
Component: engine
2016-01-14 16:44:58 -08:00
c8a4568d47
Merge pull request #19109 from BrianBland/crossRepositoryPush
...
Cross repository push
Upstream-commit: 94b2d5669016be0063abbcb6917026bdfb52478c
Component: engine
2016-01-14 18:50:53 -05:00
