Commit Graph

363 Commits

Author SHA1 Message Date
ece54e525a Update vendored docker/distribution
The registry/client/auth package now provides ErrNoBasicAuthCredentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4436f07ef42d367a801695c9bfac521e85072033
Component: engine
2016-02-11 10:28:18 -08:00
8625825024 Merge pull request #20214 from mavenugo/vin0.7.0-dev.1
Vendor libnetwork v0.7.0-dev.2
Upstream-commit: 6672d7de200d938f6a6c4e372c31712318e54dc2
Component: engine
2016-02-11 12:12:58 -05:00
b27ac0630e Merge pull request #20209 from aaronlehmann/upper-case-hostnames
Allow uppercase characters in image reference hostname
Upstream-commit: acd8baccff10642e1d44a342414cd196b81a4605
Component: engine
2016-02-11 10:50:05 -05:00
663fe6f381 Vendor libnetwork v0.7.0-dev.2
- Expose EnableIPV6 option
- discoverapi refactoring
- Fixed a few typos & docs update
- Fixes https://github.com/docker/docker/issues/20140

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b2e609176d1233eb845785dfdd72b4b747171178
Component: engine
2016-02-11 07:09:53 -08:00
cdd4058063 Update shakers vendoring to include the LICENSE 😇
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9ee8f0ad9d0128788440b245457e6447e52b97b4
Component: engine
2016-02-11 08:38:09 +01:00
e9caeb643b Merge pull request #20210 from Microsoft/jjh/hcswin32-v2
Windows: Revendor HCS to use revised error scheme
Upstream-commit: dfebb6074f62891368cb3c668380c186f3bebb33
Component: engine
2016-02-10 17:20:14 -08:00
633d5a3bff Windows: Revendor HCSShim@43858ef3
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fadbbd335cfb6d32566267385e820b36c356c14e
Component: engine
2016-02-10 14:14:45 -08:00
176a1e6aa2 Allow uppercase characters in image reference hostname
This PR makes restores the pre-Docker 1.10 behavior of allowing
uppercase characters in registry hostnames.

Note that this only applies to hostnames, not remote image names.
Previous versions also prohibited uppercase letters after the hostname,
but Docker 1.10 extended this to the hostname itself.

- Vendor updated docker/distribution.

- Add a check to "normalize" that rejects remote names with uppercase
  letters.

- Add test cases to TestTagValidPrefixedRepo and
  TestTagInvalidUnprefixedRepo

Fixes: #20056

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e2afab9c4a8be800dffee9b60b2197350987543c
Component: engine
2016-02-10 14:03:41 -08:00
58e5e14eef Revendor engine-api @ ddfd776c
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dfdce6e35ce67c8cb8b321588a577adbb02caca5
Component: engine
2016-02-10 13:26:35 -08:00
878a07f809 Vendor libnetwork v0.6.1-rc2
- Fixes #20132 #20140 #20019

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 84705f15d9b0226fa005cada11cad2ad5aad5179
Component: engine
2016-02-09 21:46:50 -08:00
289b56d094 Vendor libnetwork v0.6.1-rc1
- Fixes #20026. Programming iptables in container use native API.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2da61086ea0f7d06108f1ec4ba082f74d2c1c671
Component: engine
2016-02-05 18:20:22 -08:00
2c1fe5f691 Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads
Vendor updated distribution for resumable downloads
Upstream-commit: 9f0095f14a007950a17b000f268bb29ac5a5fa5c
Component: engine
2016-02-05 12:58:53 -08:00
d323843da1 Vendor updated distribution for resumable downloads
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4d437a29d28ec2d47ff7cf0868390b921ededa03
Component: engine
2016-02-04 17:33:37 -08:00
9a586d64c2 Merge pull request #19984 from calavera/vendor_engine_api_master
Vendor engine-api with client context changes.
Upstream-commit: da58ee42bb1d4e17c5b525d161f29ad8efc0569e
Component: engine
2016-02-04 16:20:06 -05:00
3f9e0313b7 Vendor engine-api, go-connections and go-winio.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d8355ead9ee301718563faa947fac8b62d11b9e9
Component: engine
2016-02-04 13:59:57 -05:00
f7ee374e15 Remove case sensitive duplicate dir in vendor
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b9a395c85de3f4ea10810c8df789fc67e5b4b604
Component: engine
2016-02-03 13:06:32 -08:00
79d176ce8a bump logrus to v0.9.0
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
Upstream-commit: 408092e56b7859d54138e82575a33bcfcb5fcaad
Component: engine
2016-02-02 17:53:51 -08:00
eb79a73a95 Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
Windows CI: TP4 reliability hack
Upstream-commit: a39ad952ec1efc3b7536d3d8a93e96a22cd1818b
Component: engine
2016-02-01 22:30:51 -05:00
52763c5ef6 Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
Upstream-commit: a034ac66eb766891676d1417826756870185de40
Component: engine
2016-02-01 22:30:08 -05:00
e2603dbc62 Windows CI: TP4 reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2ebcb48cf1b4f883260b62f687e2c54926749b68
Component: engine
2016-02-01 18:02:57 -08:00
07bdbb1537 Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
This update changes the way hcsshim invokes Windows DLLs to avoid races
with the garbage collector. It also now uses go-winio to access the
pipes used for communication with processes running in the container;
this reduces the number of threads used by docker.exe, improving
scalability.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 7ccc0e2101a66e0621faf1f043bf7cd5515501d5
Component: engine
2016-02-01 23:11:25 +00:00
bd6ac00111 Vendoring libnetwork 0.6.0-rc7
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b80f761b141cf88c506f40b3e439cbe7a011c5d9
Component: engine
2016-02-01 14:52:18 -08:00
1fc2a011dc Vendoring libnetwork 0.6.0-rc6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f943fd7d2427fbf893b9e0795528500fc99081b8
Component: engine
2016-01-30 20:03:03 -08:00
ee8542db2e Include a new version of notary with less verbose INFO+ logging
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 71a1caddf0af51cfc79db04f80513b292adb0231
Component: engine
2016-01-27 09:46:26 -08:00
0da34ddb69 Merge pull request #19760 from cyli/re-vendor-notary
Re-vendor Notary and docker/go
Upstream-commit: c39c7e6edf7d432730a84fa549b74203954b54c4
Component: engine
2016-01-27 09:36:26 -08:00
65cf98bf38 Re-vendor notary, as well as change jfrazelle/go to docker/go.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 8fd2c8791d9c7cf0dd28b77565f0a04349a8c9a2
Component: engine
2016-01-26 18:02:00 -08:00
a7727691d8 Update libcontainer to 3d8a20bb772defc28c355534d83
Fixes #14203

This bump fixes the issue of having the container's pipes connection
reset by peer because of using the json.Encoder and having a \n added to
the output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7b5896702bd2951541af27925620172edb5d3505
Component: engine
2016-01-26 15:00:07 -08:00
bed434b1dc Vendoring libnetwork v0.6.0-rc5
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 730a6d2fc22f9efdb18a79b39935f1438a5e5f84
Component: engine
2016-01-26 11:44:43 -08:00
eed5e0f1c7 Merge pull request #19705 from mavenugo/18222
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
Upstream-commit: 269a6d7d3656fe7edf7cb630125ee4664dd24c78
Component: engine
2016-01-26 09:16:57 -08:00
7bc1dfc4e5 vendor: update engine-api
This removes all references to InitPath and InitSha1, as well as pulling
in a few other minor engine-api fixes.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 71c63aa72e3788af27fef0de9005cde6c7728a2b
Component: engine
2016-01-27 00:34:31 +11:00
36c72742b4 Vendor libnetwork v0.6.0-rc4
- Add Endpoints() API to Sandbox interface
- Fixes #19677

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 7029d9e6ad766492c2619084c13a8ef88167eddf
Component: engine
2016-01-25 19:51:21 -08:00
bd05e8f1c1 Vendor libnetwork v0.6.0-rc3
- Fixes docker/docker#19576
- Fixed embedded DNS to listen in TCP as well
- Fixed a race-condition in IPAM to choose non-overlapping subnet for concurrent requests

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6ac9a2f410ad506204faf8f22fc502dc780e3986
Component: engine
2016-01-25 13:22:47 -08: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
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
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
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
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
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
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
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
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
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