b264f70571
Merge pull request #20521 from estesp/vendor-engine-api-fix
...
Update engine-api vendoring to latest commit
Upstream-commit: 64785ff146536cd9c86e8093fc951f22964f615e
Component: engine
2016-02-19 15:41:17 -08:00
124bd17f17
Update engine-api vendoring to latest commit
...
This picks up the change for `Content-Type` which will help solve issues
with authz plugins.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 1c2db56d2f69f74e2859da251b6b8565d72bcb02
Component: engine
2016-02-19 16:20:27 -06:00
f4798a7a2e
Merge pull request #20417 from redbaron/fix-deferred-removal-detection
...
Fix libdevmapper deferred removal detection
Upstream-commit: a657cfd68bb869602ee0bf0578e13d737855f390
Component: engine
2016-02-19 13:58:18 -07:00
0373049b19
Merge pull request #20288 from tiborvass/debian-jessie
...
Switch Dockerfile to debian:jessie ... AGAIN
Upstream-commit: 3b62a610ec81996ec3b1aa5422c62fa926ef4f04
Component: engine
2016-02-19 13:51:30 -07:00
d9c028ed66
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
Upstream-commit: 117a982d2e805d3279ff75fcec071635e5191ef6
Component: engine
2016-02-18 17:39:46 -08:00
97579187c2
Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts
...
Check in latest Win2Lin Jenkins scripts
Upstream-commit: 6a8342d63d3c649b280fdd9a2090067c2a9af14c
Component: engine
2016-02-18 15:58:24 -08:00
31f903989d
Check in latest Win2Lin Jenkins scripts
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d86f0d9b6d3b8d1077d6fb23b8f94e072ef1ba28
Component: engine
2016-02-18 11:59:08 -08:00
5ad396f39a
Vendoring libnetwork v0.7.0-dev.3
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 196b27211b77562cd6d5d620d4dd5bfe473383ed
Component: engine
2016-02-17 17:07:33 -08:00
1c1053a5c6
Fix libdevmapper deferred removal detection
...
When linking, position of `-l` flags is important since
they muse come _after_ any object files which uses symbols
from a specified library, that is due to --as-needed binutils
ld flag enabled by default
Signed-off-by: Maxim Ivanov <ivanov.maxim@gmail.com >
Upstream-commit: 24152a4231d56886928265339d15884e1cfe1038
Component: engine
2016-02-17 23:56:21 +00:00
04850e0662
Merge pull request #20187 from cyphar/vendor-runc
...
[carry 19752] vendor: update runc/libcontainer to v0.0.8
Upstream-commit: 929f62e64d8760033ff6db4607c21a6431c46e4d
Component: engine
2016-02-17 13:59:00 -08:00
9dfc13ec47
Merge pull request #20375 from tiborvass/fix-yum-index-output
...
Fix index generator for apt/yum packages
Upstream-commit: 6b70964fea1e2b7182ed8aef2577a8a74d8accd3
Component: engine
2016-02-17 21:36:02 +01:00
3288368680
vendor: update runc/libcontainer
...
This includes all of v0.0.8 as well as a few bug fixes that popped up
during vendoring.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: 093dd39686d5e7c562dfdf337bc7545f51d5abf4
Component: engine
2016-02-18 01:42:36 +11:00
eaaadc99cd
vendor: remove fsnotify
...
It is not longer used by us, so hack/vendor.sh complains because it
removes unused files (but also complains about removing an entire
vendored project).
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: bc195e1558d3091dccb209f1bb35115248886c7a
Component: engine
2016-02-18 00:12:53 +11:00
83d138a180
Merge pull request #20366 from LK4D4/socks_proxy
...
Add support for forwarding Docker client through SOCKS proxy
Upstream-commit: 5c78515430860ad822e016cc5cd5d5ff3dd6a21c
Component: engine
2016-02-16 22:29:49 -08:00
9111f0c18a
Fix index generator for apt/yum packages
...
Some @_@ characters could become visible if filename is longer than 44
characters.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 7acd3987d3d55e950ada47b41bb89ccb12b539cb
Component: engine
2016-02-16 21:54:07 -05:00
c645116653
Vendor new engine-api and go-connections
...
There is SOCKS5 proxy support in new versions.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 16effc66c028a7800096ed92174ca4bceba229ad
Component: engine
2016-02-16 10:05:01 -08:00
d67c9f367d
Only relabel /var/lib/docker on initial install
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 443ada574da41f20cdd3708e2dee3091dd363afb
Component: engine
2016-02-16 08:27:59 -05:00
47313c7b66
Switch Dockerfile to debian:jessie
...
Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q
flag and redirecting to /dev/null instead.
Add net-tools for ifconfig, because some tests rely on ifconfig.
Harmonize all Dockerfiles in this direction.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: f27b5dda4afc0b0a278eb5379d17dfc3533c5397
Component: engine
2016-02-12 21:49:54 -05:00
4fe2cef6bb
dont clean the db
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 477e1fc989dd9a58d7bee78d6bf13e5a24ebd4d6
Component: engine
2016-02-12 13:13:50 -08:00
992182031d
Merge pull request #20250 from vieux/fix_misspell
...
fix common misspells
Upstream-commit: 5ca6d3bafd0dd53dd26f8251218c68a8016e5ce7
Component: engine
2016-02-11 17:22:06 -08:00
100b7c7c54
Merge pull request #20241 from aaronlehmann/fallback-on-no-auth-credentials
...
Fall back to V1 when there are no basic auth credentials
Upstream-commit: 2a16099f5792d360be5e08d05c5742190eec03e3
Component: engine
2016-02-11 16:18:26 -08:00
697a990701
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
e18dc87631
Merge pull request #20114 from jfrazelle/fix-release-script
...
get os arch for release script
Upstream-commit: 2a64d400b34e53f38b210a4ca23ea202c9246a7f
Component: engine
2016-02-11 17:28:23 -05:00
8be99d9bc5
Merge pull request #20218 from icecrime/fix_remote_integration-cli
...
Improve remote integration-cli tests
Upstream-commit: 4cdd0403cdaac7e500f3fa6740c43792a6e066a4
Component: engine
2016-02-11 22:51:20 +01:00
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
3f33957369
Merge pull request #20124 from calavera/fix_vendor_codec_cleanup
...
Do not purge github.com/ugorji/go/codec from vendor.
Upstream-commit: 944e4cab2ed8370f088416ccb3cad890f3aa5102
Component: engine
2016-02-11 12:51:35 -05: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
ac0021ada8
Do not purge github.com/ugorji/go/codec from vendor.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d11a2c758a497500bba08495f218b8f242fafad3
Component: engine
2016-02-11 11:22:55 -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
47f5776cce
Improve remote integration-cli tests
...
Progress toward being able to run integration-cli campaign using a
client hitting a remote host.
Most of these fixes imply flagging tests that assume they are running on
the same host than the Daemon. Also fixes the `contrib/httpserver` image
that couldn't run because of a dynamically linked Go binary inside the
busybox image.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: a943c401509e7994ae5c574a4b7e23354e44a105
Component: engine
2016-02-11 07:31:49 -08: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
7f7a4e0915
Merge pull request #20184 from fkautz/pr_out_adding_backup_key_server_in_install_script
...
Adding backup key server in install script
Upstream-commit: e2a0618fb1f32572f2b5b11f97278634be4ea31c
Component: engine
2016-02-10 19:08:49 -08: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
0944ceb1d1
Adding backup key server in install script
...
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com >
Upstream-commit: 5e0b8b99d115bc6b12d930e80aca69fecc7dda78
Component: engine
2016-02-09 23:26:45 -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
6ae6421b5c
Merge pull request #20158 from cpuguy83/carry_19504
...
Dockerfile,contrib,hack: remove buildpack-deps
Upstream-commit: fa860c86ff0a368e686535c2689d1099fa9ea7a2
Component: engine
2016-02-09 14:58:37 -05:00
1a2b70c103
use debian:jessie for ensure-syscall-test
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7c9e9afeb78ad3265c2ec5d4c6969c0d6182af2b
Component: engine
2016-02-09 13:13:38 -05:00
5bd791913c
Merge pull request #20106 from jfrazelle/go-generate-json-default-profile
...
add default seccomp profile as json
Upstream-commit: 3846951fce14d7e66a9e51fefcaadece47bd5ab4
Component: engine
2016-02-08 14:48:34 -08:00
cb9f693ca8
add validation for generating default secccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 9bc771af9d09026111916191394eb2896608eb59
Component: engine
2016-02-08 13:04:52 -08:00
e47678e267
get os arch for release script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 26da52d4a5ae101c638ea5b093f7262a744251f0
Component: engine
2016-02-08 10:57:04 -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
e6f8a347a4
Merge pull request #20038 from doertedev/master
...
Grep for installed AND held packages.
Upstream-commit: f7f1730316d97d7077e3d311e54278f46e440d95
Component: engine
2016-02-05 13:31:30 -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
18d20ed26a
Use grep -qE instead of egrep which is deprecated.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com >
Upstream-commit: b3d66ff010268e1f63f5555508833dcf3604f0b6
Component: engine
2016-02-05 18:55:39 +01:00
2a6ce914c6
Grep for installed AND held packages.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com >
Upstream-commit: 996ca75413f4072c03cca9229dc5901bd690c4f8
Component: engine
2016-02-05 17:41:57 +01: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
