929f62e64d
Merge pull request #20187 from cyphar/vendor-runc
...
[carry 19752] vendor: update runc/libcontainer to v0.0.8
2016-02-17 13:59:00 -08:00
6b70964fea
Merge pull request #20375 from tiborvass/fix-yum-index-output
...
Fix index generator for apt/yum packages
2016-02-17 21:36:02 +01:00
093dd39686
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>
2016-02-18 01:42:36 +11:00
bc195e1558
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>
2016-02-18 00:12:53 +11:00
5c78515430
Merge pull request #20366 from LK4D4/socks_proxy
...
Add support for forwarding Docker client through SOCKS proxy
2016-02-16 22:29:49 -08:00
7acd3987d3
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>
2016-02-16 21:54:07 -05:00
16effc66c0
Vendor new engine-api and go-connections
...
There is SOCKS5 proxy support in new versions.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-16 10:05:01 -08:00
443ada574d
Only relabel /var/lib/docker on initial install
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-02-16 08:27:59 -05:00
f27b5dda4a
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>
2016-02-12 21:49:54 -05:00
477e1fc989
dont clean the db
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-12 13:13:50 -08:00
5ca6d3bafd
Merge pull request #20250 from vieux/fix_misspell
...
fix common misspells
2016-02-11 17:22:06 -08:00
2a16099f57
Merge pull request #20241 from aaronlehmann/fallback-on-no-auth-credentials
...
Fall back to V1 when there are no basic auth credentials
2016-02-11 16:18:26 -08:00
99a396902f
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:49:36 -08:00
2a64d400b3
Merge pull request #20114 from jfrazelle/fix-release-script
...
get os arch for release script
2016-02-11 17:28:23 -05:00
4cdd0403cd
Merge pull request #20218 from icecrime/fix_remote_integration-cli
...
Improve remote integration-cli tests
2016-02-11 22:51:20 +01:00
4436f07ef4
Update vendored docker/distribution
...
The registry/client/auth package now provides ErrNoBasicAuthCredentials.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-11 10:28:18 -08:00
944e4cab2e
Merge pull request #20124 from calavera/fix_vendor_codec_cleanup
...
Do not purge github.com/ugorji/go/codec from vendor.
2016-02-11 12:51:35 -05:00
6672d7de20
Merge pull request #20214 from mavenugo/vin0.7.0-dev.1
...
Vendor libnetwork v0.7.0-dev.2
2016-02-11 12:12:58 -05:00
d11a2c758a
Do not purge github.com/ugorji/go/codec from vendor.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-11 11:22:55 -05:00
acd8baccff
Merge pull request #20209 from aaronlehmann/upper-case-hostnames
...
Allow uppercase characters in image reference hostname
2016-02-11 10:50:05 -05:00
a943c40150
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>
2016-02-11 07:31:49 -08:00
b2e609176d
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>
2016-02-11 07:09:53 -08:00
9ee8f0ad9d
Update shakers vendoring to include the LICENSE 😇
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-11 08:38:09 +01:00
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
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
fadbbd335c
Windows: Revendor HCSShim@43858ef3
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-10 14:14:45 -08:00
e2afab9c4a
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>
2016-02-10 14:03:41 -08:00
dfdce6e35c
Revendor engine-api @ ddfd776c
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-10 13:26:35 -08:00
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
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
fa860c86ff
Merge pull request #20158 from cpuguy83/carry_19504
...
Dockerfile,contrib,hack: remove buildpack-deps
2016-02-09 14:58:37 -05:00
7c9e9afeb7
use debian:jessie for ensure-syscall-test
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-09 13:13:38 -05:00
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
9bc771af9d
add validation for generating default secccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-08 13:04:52 -08:00
26da52d4a5
get os arch for release script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-08 10:57:04 -08:00
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
f7f1730316
Merge pull request #20038 from doertedev/master
...
Grep for installed AND held packages.
2016-02-05 13:31:30 -08:00
9f0095f14a
Merge pull request #19887 from aaronlehmann/vendor-resumable-downloads
...
Vendor updated distribution for resumable downloads
2016-02-05 12:58:53 -08:00
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
996ca75413
Grep for installed AND held packages.
...
Signed-off-by: Stefan Staudenmeyer <doerte@instana.com>
2016-02-05 17:41:57 +01:00
4d437a29d2
Vendor updated distribution for resumable downloads
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-04 17:33:37 -08:00
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
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
49a45d80f2
Dockerfile,contrib,hack: remove buildpack-deps
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-02-04 20:22:34 +02:00
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
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
57025bd588
Merge pull request #19972 from jfrazelle/fix-opensuse
...
fix opensuse rpm
2016-02-03 13:19:51 -08:00
b9a395c85d
Remove case sensitive duplicate dir in vendor
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-03 13:06:32 -08:00
1cbd772629
fix opensuse rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-03 10:34:17 -08:00
408092e56b
bump logrus to v0.9.0
...
Signed-off-by: Amit Krishnan <amit.krishnan@oracle.com>
2016-02-02 17:53:51 -08:00
a39ad952ec
Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
...
Windows CI: TP4 reliability hack
2016-02-01 22:30:51 -05:00
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
2ebcb48cf1
Windows CI: TP4 reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 18:02:57 -08:00
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
b80f761b14
Vendoring libnetwork 0.6.0-rc7
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-01 14:52:18 -08:00
f943fd7d24
Vendoring libnetwork 0.6.0-rc6
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-30 20:03:03 -08:00
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
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
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
07312af8fa
Merge pull request #19747 from cpuguy83/nogc
...
Turn off GC during `make binary`
2016-01-27 15:02:38 -08:00
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
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
c39c7e6edf
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
2016-01-27 09:36:26 -08:00
ae14e6cc0a
Merge pull request #19071 from icecrime/incremental_builds
...
Enable incremental builds
2016-01-27 11:21:01 -05:00
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
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
3eaf878999
Merge pull request #19751 from crosbymichael/update-libcontainer-jan26
...
Update libcontainer to 3d8a20bb772defc28c355534d83
2016-01-26 16:57:49 -08:00
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
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
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
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
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
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
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
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
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
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
0f379fab31
add trailing slash
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-25 09:01:46 -08:00
5601fc8507
Windows CI: In container logic flaw
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-24 09:22:50 -08:00
0c7201ee73
Fixes #19614
...
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
2016-01-24 10:28:18 +01:00
6d1455e74b
Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer
...
Hotfix vendor libcontainer
2016-01-22 16:46:04 -08:00
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
a9fc4939df
Merge pull request #19573 from sanimej/libn
...
Vendor in libnetwork v0.6.0-rc2
2016-01-22 12:07:40 -05:00
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
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
02c9d48144
Vendor in libnetwork v0.6.0-rc2
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-21 20:46:28 -08:00
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
e287bef453
Merge pull request #19316 from Microsoft/jjh/incontainererror
...
Windows: In container build check
2016-01-21 13:44:19 -08:00
3ecba7089b
Merge pull request #19552 from aaronlehmann/vendor-distribution-3
...
Vendor updated distribution package
2016-01-21 16:21:59 -05:00
4dbd612d47
Windows: In container build check
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 13:15:23 -08:00
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
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
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
8c0dd9d182
Merge pull request #19522 from aaronlehmann/vendor-distribution-2
...
Vendor updated distribution
2016-01-21 08:15:41 -08:00
5537a92e45
Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
...
Cleanup build rpm deb
2016-01-20 23:58:33 -08:00
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
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
7bddbdf360
Merge pull request #19503 from jfrazelle/update-logrus
...
bump logrus
2016-01-20 12:54:49 -08:00
bcf155bb7a
Merge pull request #19469 from crosbymichael/libcontainer-resource-hf
...
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
2016-01-20 11:31:14 -08:00
95695aa38c
bump logrus
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-20 09:51:09 -08:00
Alexander Morozov
Sebastiaan van Stijn
Aleksa Sarai
Phil Estes
Tibor Vass
Alexander Morozov
Dan Walsh
Jessica Frazelle
David Calavera
Victor Vieux
Jess Frazelle
Vincent Demeester
Aaron Lehmann
Brian Goff
Arnaud Porterie
Madhu Venugopal
John Howard
Frederick F. Kautz IV
Stefan Staudenmeyer
Tibor Vass
unclejack
Paul Liljenberg
Tonis Tiigi
Amit Krishnan
John Starks
Alessandro Boch
Govinda Fichtner
cyli
Michael Crosby
Mike Dougherty
Jana Radhakrishnan
Santhosh Manohar