Commit Graph

1279 Commits

Author SHA1 Message Date
Amit Krishnan 408092e56b bump logrus to v0.9.0
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
2016-02-02 17:53:51 -08:00
Brian Goff a39ad952ec Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
Windows CI: TP4 reliability hack
2016-02-01 22:30:51 -05:00
Brian Goff a034ac66eb Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
2016-02-01 22:30:08 -05:00
John Howard 2ebcb48cf1 Windows CI: TP4 reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 18:02:57 -08:00
John Starks 7ccc0e2101 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>
2016-02-01 23:11:25 +00:00
Alessandro Boch b80f761b14 Vendoring libnetwork 0.6.0-rc7
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-01 14:52:18 -08:00
Alessandro Boch f943fd7d24 Vendoring libnetwork 0.6.0-rc6
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-30 20:03:03 -08:00
Jess Frazelle c006c02611 Merge pull request #19735 from jfrazelle/add-repo-scripts
add scripts to clean experimental rpms and debs
2016-01-29 15:52:18 -08:00
Govinda Fichtner 7b31ed432e add support for building first ARM debian package
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2016-01-29 00:21:17 +01:00
Jessica Frazelle 9ca8386c57
add scripts to clean experimental rpms and debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-27 15:54:53 -08:00
Jess Frazelle 07312af8fa Merge pull request #19747 from cpuguy83/nogc
Turn off GC during `make binary`
2016-01-27 15:02:38 -08:00
Brian Goff 9672afa339 Add `DOCKER_BUILD_GOGC` to tweak GOGC for compile
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-27 13:35:26 -05:00
cyli 71a1caddf0 Include a new version of notary with less verbose INFO+ logging
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-01-27 09:46:26 -08:00
Jess Frazelle c39c7e6edf Merge pull request #19760 from cyli/re-vendor-notary
Re-vendor Notary and docker/go
2016-01-27 09:36:26 -08:00
Brian Goff ae14e6cc0a Merge pull request #19071 from icecrime/incremental_builds
Enable incremental builds
2016-01-27 11:21:01 -05:00
Arnaud Porterie 1445e4db32 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>
2016-01-26 21:24:44 -08:00
cyli 8fd2c8791d Re-vendor notary, as well as change jfrazelle/go to docker/go.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-01-26 18:02:00 -08:00
Tibor Vass 3eaf878999 Merge pull request #19751 from crosbymichael/update-libcontainer-jan26
Update libcontainer to 3d8a20bb772defc28c355534d83
2016-01-26 16:57:49 -08:00
Sebastiaan van Stijn 4bcb6c7fc8 Merge pull request #19150 from mikedougherty/cs-108-rpm-release
[CS-108] Adjust version string processing for RPM build
2016-01-26 15:22:14 -08:00
Michael Crosby 7b5896702b 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>
2016-01-26 15:00:07 -08:00
Mike Dougherty 0410023367 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>
2016-01-26 11:49:59 -08:00
Jana Radhakrishnan 730a6d2fc2 Vendoring libnetwork v0.6.0-rc5
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-01-26 11:44:43 -08:00
Jess Frazelle b5420be597 Merge pull request #19013 from hqhq/add_support_docker_aarch64
Add support for build and test docker on arm64
2016-01-26 10:33:48 -08:00
Arnaud Porterie 269a6d7d36 Merge pull request #19705 from mavenugo/18222
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
2016-01-26 09:16:57 -08:00
Aleksa Sarai 71c63aa72e 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>
2016-01-27 00:34:31 +11:00
Aleksa Sarai 4357ed4a73 *: 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>
2016-01-26 23:47:02 +11:00
Madhu Venugopal 7029d9e6ad Vendor libnetwork v0.6.0-rc4
- Add Endpoints() API to Sandbox interface
- Fixes #19677

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-25 19:51:21 -08:00
Madhu Venugopal 6ac9a2f410 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>
2016-01-25 13:22:47 -08:00
Jessica Frazelle 0f379fab31
add trailing slash
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-25 09:01:46 -08:00
John Howard 5601fc8507 Windows CI: In container logic flaw
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-24 09:22:50 -08:00
Paul Liljenberg 0c7201ee73 Fixes #19614
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
2016-01-24 10:28:18 +01:00
Sebastiaan van Stijn 6d1455e74b Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer
Hotfix vendor libcontainer
2016-01-22 16:46:04 -08:00
Jess Frazelle 21ec6d3789 Merge pull request #19146 from mikedougherty/cs-105-download-script
Create a bundle for the install script to support other domains
2016-01-22 09:25:24 -08:00
Tibor Vass a9fc4939df Merge pull request #19573 from sanimej/libn
Vendor in libnetwork v0.6.0-rc2
2016-01-22 12:07:40 -05:00
Tibor Vass cba7ba25f4 Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm
Enable DockerTrustSuite for ARM again
2016-01-22 11:23:19 -05:00
Aleksa Sarai 40b5eebb0b 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>
2016-01-22 20:15:09 +11:00
Santhosh Manohar 02c9d48144 Vendor in libnetwork v0.6.0-rc2
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-21 20:46:28 -08:00
Mike Dougherty 51dad1185a 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>
2016-01-21 20:42:20 -08:00
Jess Frazelle e287bef453 Merge pull request #19316 from Microsoft/jjh/incontainererror
Windows: In container build check
2016-01-21 13:44:19 -08:00
Tibor Vass 3ecba7089b Merge pull request #19552 from aaronlehmann/vendor-distribution-3
Vendor updated distribution package
2016-01-21 16:21:59 -05:00
John Howard 4dbd612d47 Windows: In container build check
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 13:15:23 -08:00
Aaron Lehmann 921eae9d6d 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>
2016-01-21 11:01:14 -08:00
Tibor Vass 5f9375cf39 Merge pull request #19349 from jfrazelle/add-link-to-wiki
add warning if upgrading via script to migrate
2016-01-21 12:51:25 -05:00
Tibor Vass 7d19ca7c40 Merge pull request #19423 from jfrazelle/apparmor-no-install
disable install of docker-engine for 1.10, try to get ready for 1.11
2016-01-21 12:08:50 -05:00
David Calavera 8c0dd9d182 Merge pull request #19522 from aaronlehmann/vendor-distribution-2
Vendor updated distribution
2016-01-21 08:15:41 -08:00
Jess Frazelle 5537a92e45 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
Cleanup build rpm deb
2016-01-20 23:58:33 -08:00
Aaron Lehmann a160dd4987 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>
2016-01-20 15:46:11 -08:00
Sebastiaan van Stijn c21eb2a420 Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles
Remove validate-vendor from default bundles
2016-01-20 14:29:07 -08:00
Alexander Morozov 7bddbdf360 Merge pull request #19503 from jfrazelle/update-logrus
bump logrus
2016-01-20 12:54:49 -08:00
David Calavera bcf155bb7a Merge pull request #19469 from crosbymichael/libcontainer-resource-hf
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
2016-01-20 11:31:14 -08:00