Arnaud Porterie
e2a0618fb1
Merge pull request #20184 from fkautz/pr_out_adding_backup_key_server_in_install_script
...
Adding backup key server in install script
2016-02-10 19:08:49 -08:00
David Calavera
dfebb6074f
Merge pull request #20210 from Microsoft/jjh/hcswin32-v2
...
Windows: Revendor HCS to use revised error scheme
2016-02-10 17:20:14 -08:00
John Howard
fadbbd335c
Windows: Revendor HCSShim@43858ef3
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-10 14:14:45 -08:00
John Howard
dfdce6e35c
Revendor engine-api @ ddfd776c
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-10 13:26:35 -08:00
Frederick F. Kautz IV
5e0b8b99d1
Adding backup key server in install script
...
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com>
2016-02-09 23:26:45 -08:00
Madhu Venugopal
84705f15d9
Vendor libnetwork v0.6.1-rc2
...
- Fixes #20132 #20140 #20019
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-09 21:46:50 -08:00
Brian Goff
fa860c86ff
Merge pull request #20158 from cpuguy83/carry_19504
...
Dockerfile,contrib,hack: remove buildpack-deps
2016-02-09 14:58:37 -05:00
Brian Goff
7c9e9afeb7
use debian:jessie for ensure-syscall-test
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-09 13:13:38 -05:00
David Calavera
3846951fce
Merge pull request #20106 from jfrazelle/go-generate-json-default-profile
...
add default seccomp profile as json
2016-02-08 14:48:34 -08:00
Jessica Frazelle
9bc771af9d
add validation for generating default secccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-08 13:04:52 -08:00
Madhu Venugopal
2da61086ea
Vendor libnetwork v0.6.1-rc1
...
- Fixes #20026 . Programming iptables in container use native API.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-02-05 18:20:22 -08:00
David Calavera
f7f1730316
Merge pull request #20038 from doertedev/master
...
Grep for installed AND held packages.
2016-02-05 13:31:30 -08:00
Alexander Morozov
9f0095f14a
Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads
...
Vendor updated distribution for resumable downloads
2016-02-05 12:58:53 -08:00
Stefan Staudenmeyer
b3d66ff010
Use grep -qE instead of egrep which is deprecated.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2016-02-05 18:55:39 +01:00
Stefan Staudenmeyer
996ca75413
Grep for installed AND held packages.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2016-02-05 17:41:57 +01:00
Aaron Lehmann
4d437a29d2
Vendor updated distribution for resumable downloads
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-04 17:33:37 -08:00
Tibor Vass
da58ee42bb
Merge pull request #19984 from calavera/vendor_engine_api_master
...
Vendor engine-api with client context changes.
2016-02-04 16:20:06 -05:00
David Calavera
d8355ead9e
Vendor engine-api, go-connections and go-winio.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-04 13:59:57 -05:00
unclejack
49a45d80f2
Dockerfile,contrib,hack: remove buildpack-deps
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-02-04 20:22:34 +02:00
Paul Liljenberg
620b8250e8
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>
2016-02-04 18:14:08 +01:00
Jess Frazelle
e74c07b947
Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
...
Remove case sensitive duplicate dir in vendor
2016-02-03 17:32:14 -08:00
Alexander Morozov
57025bd588
Merge pull request #19972 from jfrazelle/fix-opensuse
...
fix opensuse rpm
2016-02-03 13:19:51 -08:00
Tonis Tiigi
b9a395c85d
Remove case sensitive duplicate dir in vendor
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-03 13:06:32 -08:00
Jessica Frazelle
1cbd772629
fix opensuse rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-03 10:34:17 -08:00
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