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
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
4506ff3119
improve test-deb-install
...
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
add directory test
Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
fix indent
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com >
Upstream-commit: 620b8250e85abbe284eb8d34799df1bb73d82d6a
Component: engine
2016-02-04 18:14:08 +01:00
8cc70508c1
Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
...
Remove case sensitive duplicate dir in vendor
Upstream-commit: e74c07b947adf2d6d804068e4a647265e6e419f2
Component: engine
2016-02-03 17:32:14 -08:00
05cb58c519
Merge pull request #19972 from jfrazelle/fix-opensuse
...
fix opensuse rpm
Upstream-commit: 57025bd58821a6972185fb4c0a5559289d769ef6
Component: engine
2016-02-03 13:19:51 -08: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
455910471d
fix opensuse rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 1cbd77262987d821a675f51da1213c7bf171e05b
Component: engine
2016-02-03 10:34:17 -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
0063d9bddd
Merge pull request #19735 from jfrazelle/add-repo-scripts
...
add scripts to clean experimental rpms and debs
Upstream-commit: c006c0261159224675397162aa3a03d9adbb180b
Component: engine
2016-01-29 15:52:18 -08:00
9512e36135
add support for building first ARM debian package
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
Upstream-commit: 7b31ed432ee2fa95938d64dc76c982e52cd00330
Component: engine
2016-01-29 00:21:17 +01:00
f35ef7f96a
add scripts to clean experimental rpms and debs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 9ca8386c5720d887f6c22b657324e9fc6ff2487d
Component: engine
2016-01-27 15:54:53 -08:00
5ca7c24367
Merge pull request #19747 from cpuguy83/nogc
...
Turn off GC during `make binary`
Upstream-commit: 07312af8fa160c1c87558288e1de9d309b1e9c90
Component: engine
2016-01-27 15:02:38 -08:00
259365d60a
Add DOCKER_BUILD_GOGC to tweak GOGC for compile
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9672afa3391119b3b06d87735041168b01b7f1da
Component: engine
2016-01-27 13:35:26 -05: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
7383a82de4
Merge pull request #19071 from icecrime/incremental_builds
...
Enable incremental builds
Upstream-commit: ae14e6cc0ab24b57e7a6873ece7263bb6cc6aa44
Component: engine
2016-01-27 11:21:01 -05:00
50846c5d05
Enable incremental builds
...
Remove the `-a` build flag and introduce `-i` in order to reuse
previously compiled dependencies.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 1445e4db32e648277470513213473021ca59010a
Component: engine
2016-01-26 21:24:44 -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
75b4488b94
Merge pull request #19751 from crosbymichael/update-libcontainer-jan26
...
Update libcontainer to 3d8a20bb772defc28c355534d83
Upstream-commit: 3eaf878999553cebc5b77e5f835f017793991b9a
Component: engine
2016-01-26 16:57:49 -08:00
272aadc7e6
Merge pull request #19150 from mikedougherty/cs-108-rpm-release
...
[CS-108] Adjust version string processing for RPM build
Upstream-commit: 4bcb6c7fc8758ad390a634a270cda66a8c98c9f3
Component: engine
2016-01-26 15:22:14 -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
f352b24e50
Adjust version string processing for RPM build
...
This will only trim off the last '-' separated token to be checked for
RC status. This allows including a 'cs#' token in the version string.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com >
Upstream-commit: 04100233679124a2d0b6c622cec81954f3aaf38d
Component: engine
2016-01-26 11:49:59 -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
aa78ebdfe7
Merge pull request #19013 from hqhq/add_support_docker_aarch64
...
Add support for build and test docker on arm64
Upstream-commit: b5420be597ea9ce6a0ea7f544a141711289cd3da
Component: engine
2016-01-26 10:33:48 -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
4edafc3bc1
*: purge dockerinit from source code
...
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +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
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
