Commit Graph

1697 Commits

Author SHA1 Message Date
Tianon Gravi 5bfaab984c Merge pull request #20636 from anusha-ragunathan/apt-ftparchive
Always create apt-ftparchive.conf.
2016-02-26 14:12:06 -08:00
Riyaz Faizullabhoy 0bb1acee37 bumping miekg/pkcs11 dependency for go1.6
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-02-25 21:29:37 -08:00
Riyaz Faizullabhoy 84dc2d9e70 Vendor in notary v0.2.0
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-02-25 13:40:00 -08:00
Tibor Vass f4a1e3db99 Support TLS remote test daemon
This will allow us to have a windows-to-linux CI, where the linux host
can be anywhere, connecting with TLS.

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-25 14:12:17 -05:00
Mike Danese 123f22004b vendor: add dependencies of gcplogs driver
The added dependencies are:
* golang.org/x/oauth2
* google.golang.org/api
* google.golang.org/cloud

Signed-off-by: Mike Danese <mikedanese@google.com>
2016-02-24 10:42:32 -08:00
Brian Goff d3bffa1639 Revert "vendor: remove fsnotify"
This reverts commit bc195e1558.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-23 21:43:27 -05:00
Anusha Ragunathan 204c7808f9 Always create apt-ftparchive.conf.
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.

However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf

This change always creates config using suites in contrib/reprepro/suites.sh.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-02-23 16:06:43 -08:00
Alexander Morozov 4fc5bd295e Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
It includes fix for parsing systemd cgroup names

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-23 13:37:20 -08:00
Nalin Dahyabhai 6cdc4ba6cd Try to handle changing names for journal packages
When checking if we have the development files for libsystemd's journal
APIs, check for either 'libsystemd >= 209' and 'libsystemd-journal'.  If
we find 'libsystemd', define the 'journald' tag, which defaults to using
the 'libsystemd.pc' file.  If we find the older 'libsystemd-journal',
define both the 'journald' and 'journald_compat' tags, which causes the
'libsystemd-journal.pc' file to be consulted instead.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2016-02-23 12:24:27 -05:00
Stefan Weil 2eee613326 Fix some typos in comments and strings
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-22 20:27:15 +01:00
David Calavera 64785ff146 Merge pull request #20521 from estesp/vendor-engine-api-fix
Update engine-api vendoring to latest commit
2016-02-19 15:41:17 -08:00
Phil Estes 1c2db56d2f 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)
2016-02-19 16:20:27 -06:00
Jess Frazelle a657cfd68b Merge pull request #20417 from redbaron/fix-deferred-removal-detection
Fix libdevmapper deferred removal detection
2016-02-19 13:58:18 -07:00
Jess Frazelle 3b62a610ec Merge pull request #20288 from tiborvass/debian-jessie
Switch Dockerfile to debian:jessie ... AGAIN
2016-02-19 13:51:30 -07:00
Arnaud Porterie 117a982d2e Merge pull request #20419 from aboch/cr
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
2016-02-18 17:39:46 -08:00
Arnaud Porterie 6a8342d63d Merge pull request #20460 from Microsoft/jjh/latestw2lciscripts
Check in latest Win2Lin Jenkins scripts
2016-02-18 15:58:24 -08:00
John Howard d86f0d9b6d Check in latest Win2Lin Jenkins scripts
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-18 11:59:08 -08:00
Alessandro Boch 196b27211b Vendoring libnetwork v0.7.0-dev.3
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-17 17:07:33 -08:00
Maxim Ivanov 24152a4231 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>
2016-02-17 23:56:21 +00:00
Alexander Morozov 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
Sebastiaan van Stijn 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
Aleksa Sarai 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
Aleksa Sarai 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
Phil Estes 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
Tibor Vass 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
Alexander Morozov 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
Dan Walsh 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
Tibor Vass 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
Jessica Frazelle 477e1fc989
dont clean the db
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-12 13:13:50 -08:00
David Calavera 5ca6d3bafd Merge pull request #20250 from vieux/fix_misspell
fix common misspells
2016-02-11 17:22:06 -08:00
David Calavera 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
Victor Vieux 99a396902f fix common misspell
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-11 15:49:36 -08:00
Jess Frazelle 2a64d400b3 Merge pull request #20114 from jfrazelle/fix-release-script
get os arch for release script
2016-02-11 17:28:23 -05:00
Vincent Demeester 4cdd0403cd Merge pull request #20218 from icecrime/fix_remote_integration-cli
Improve remote integration-cli tests
2016-02-11 22:51:20 +01:00
Aaron Lehmann 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
Brian Goff 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
Phil Estes 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
David Calavera 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
Brian Goff 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
Arnaud Porterie 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
Madhu Venugopal 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
Vincent Demeester 9ee8f0ad9d Update shakers vendoring to include the LICENSE 😇
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-11 08:38:09 +01:00
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
Aaron Lehmann 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
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
Jessica Frazelle 26da52d4a5
get os arch for release script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-08 10:57:04 -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
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
Jessica Frazelle 95695aa38c
bump logrus
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-20 09:51:09 -08:00
Vincent Demeester e5bce74592 Remove validate-vendor from default bundles
Because it's triggered another way :)
See https://github.com/docker/leeroy/pull/44

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-20 18:29:28 +01:00
Stefan Scherer acb42c5fab Enable DockerTrustSuite for ARM again
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-20 14:58:09 +01:00
Vincent Demeester 87b7ff5267 Merge pull request #19465 from mavenugo/sysd
Vendor libnetwork v0.6.0-rc1
2016-01-20 09:02:21 +01:00
Tibor Vass 7657e233f7 Merge pull request #19466 from aaronlehmann/vendor-distribution
Vendor updated docker/distribution package
2016-01-19 21:05:43 -05:00
Jessica Frazelle 0bff2515f7
add a way to only build requested pkgs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-19 17:47:27 -08:00
Jessica Frazelle 60d44d8b80
add warning if upgrading via script to migrate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-19 15:41:08 -08:00
Michael Crosby 5f73ab8952 Update libcontainer to 47e3f834d73e76bc2a6a585b48d
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-01-19 15:34:08 -08:00
Madhu Venugopal ee3b42f385 Vendor libnetwork v0.6.0-rc1
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
  network plugin (https://github.com/docker/libnetwork/issues/813)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-19 13:50:17 -08:00
Aaron Lehmann 588e27f9a5 Vendor updated docker/distribution package
Fixes #19400

Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-19 13:28:51 -08:00
Christopher Jones d12f4babdd Fix test requirement for ARM
Correctly passes the DOCKER_ENGINE_GOARCH env var
to the testing environment

Also fixes logic for skipping a test if on ARM.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-01-19 15:23:46 -05:00
Vincent Demeester 011ca5f206 Merge pull request #19426 from sanimej/restart
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
2016-01-19 10:28:33 +01:00
Jess Frazelle 637f49b5af Merge pull request #19196 from Microsoft/jjh/tp4ci
Windows CI: Setup for testing against Windows
2016-01-18 15:22:08 -08:00
Jessica Frazelle c4bc9657b9
disable install of docker-engine for 1.10, try to get ready for 1.11
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-18 13:38:29 -08:00
Stefan Scherer 4f339570cb Skip failing tests on ARM to get red/green feedback from Jenkins
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-18 17:00:15 +01:00
Santhosh Manohar bccf653082 Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
- Fixes the issue of Shutdown() not working, resulting in hung
  goroutines

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-17 08:17:13 -08:00
Jess Frazelle b69243e951 Merge pull request #19169 from Djelibeybi/fix-ol6-build
Restoring the RPM build process for Oracle Linux 6
2016-01-15 16:56:11 -08:00
Alexander Morozov 790e648c06 Merge pull request #19340 from Microsoft/jjh/rsrcfix
Windows: Remove linkmode internal hack
2016-01-15 14:10:56 -08:00
Phil Estes dd104eb91d Merge pull request #19345 from tianon/fast-syscall-compile
Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
2016-01-15 16:06:14 -05:00
Qiang Huang 66d24c2b44 Add support for build and test docker on arm64
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-01-15 14:25:03 +00:00
Jess Frazelle 4c89b1f72c Merge pull request #19355 from riyazdf/notary-revendor
notary revendor into docker
2016-01-15 01:02:35 -08:00
Riyaz Faizullabhoy dd7436c832 revendor notary and wrap friendlier error messages
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-14 20:35:59 -08:00
Sebastiaan van Stijn e44364eae9 Merge pull request #18587 from calavera/daemon_configuration_file
Allow to set daemon and server configurations in a file.
2016-01-14 16:44:58 -08:00
Tibor Vass 94b2d56690 Merge pull request #19109 from BrianBland/crossRepositoryPush
Cross repository push
2016-01-14 18:50:53 -05:00
Brian Bland 6309947718 Changes cross-repository blob mounting to a blob Create option
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata

Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-14 14:26:03 -08:00
Tianon Gravi 9b2aab3fc8 Switch "syscall-test" image from "debian:jessie" to "buildpack-deps:jessie" so that "gcc" is already included
This results in a significant time savings during repeated builds (since we don't have to re-download gcc for every test run).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-14 13:51:30 -08:00
John Howard 6ca5a2c476 Windows: Remove linkmode internal hack
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 13:09:28 -08:00
David Calavera db2b5e647c Merge pull request #19338 from aboch/vnd
Vendoring libnetwork v0.5.5
2016-01-14 13:02:20 -08:00
Jess Frazelle 7a44265129 Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog
Remove the changelog auto-generation
2016-01-14 12:47:32 -08:00
Santhosh Manohar 5347f7cd94 Vendoring libnetwork v0.5.6
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-14 10:48:48 -08:00
Alessandro Boch 4e4ba9dd3a Vendoring libnetwork v0.5.5
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-14 10:34:00 -08:00
David Calavera 1666707cf8 Vendor merge structure tool.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 11:58:38 -05:00
Avi Miller b916d45132 Remove the changelog auto-generation because its hardcoded in the .spec file now.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-14 18:50:55 +11:00
Brian Goff 742a7d53f2 Merge pull request #19319 from calavera/fix_tls_config_for_response_hijacking
Fix response hijacking with TLS enabled.
2016-01-13 21:44:11 -05:00
David Calavera 7a5d897410 Vendor engine-api 0.2.2.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-13 20:09:47 -05:00
Avi Miller 22af8dfb14 Not having a changelog is bad RPM etiquette.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-14 10:34:48 +11:00
Brian Bland 7289c7218e Adds cross-repository blob pushing behavior
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.

Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-13 14:26:30 -08:00
Tibor Vass 46eb470039 Merge pull request #19267 from mavenugo/vin-ln
Vendor libnetwork v0.5.4
2016-01-13 07:09:58 -05:00
Madhu Venugopal 537089481f Vendor libnetwork v0.5.4
- Removed the isNodeAlive protection when user forces an endpoint delete

- Bridge driver supporting internal network option
- Backend implementation to support "force" option to network disconnect
- Fixing a regex in etchosts package to fix docker/docker#19080

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-12 20:42:30 -08:00
Jessica Frazelle 062d0b3921
read seccomp profile locally then pass to daemon
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-12 13:12:29 -08:00
David Calavera ca60e6262b Vendor engine-api 0.2.1.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:16 -05:00
Sebastiaan van Stijn c72be040bb Merge pull request #19187 from estesp/lets-do-this
User namespaces: graduate from experimental
2016-01-12 09:34:19 -08:00
Sebastiaan van Stijn 656979670c Merge pull request #18998 from calavera/syslog_tls
Allow syslog over TCP+TLS.
2016-01-11 17:21:38 -08:00
Tibor Vass df40c61f8a Make Makefile work on OS X
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-11 18:16:56 -05:00
Arnaud Porterie f11b6a2ab3 Merge pull request #18785 from aaronlehmann/new-manifest
New image manifest format
2016-01-11 12:01:46 -08:00
John Howard a4b77dc1af Windows CI: Setup for testing against Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-11 11:52:03 -08:00
Tibor Vass 2d5ca742eb Merge pull request #19076 from tianon/multiarch
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
2016-01-11 13:25:55 -05:00
Arnaud Porterie ad2966a315 Merge pull request #19138 from Microsoft/jjh/failedtodockerversion
Windows CI: More debugging
2016-01-10 18:11:19 -08:00
Arnaud Porterie fe3d1f9dd7 Merge pull request #19198 from sanimej/vin
Vendoring libnetwork
2016-01-10 11:46:34 -08:00
Aaron Lehmann 290ba41c00 Vendor updated github.com/docker/distribution
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-08 17:24:20 -08:00
cyli 5719b136de Re-vendoring notary in order to deal with a canonical JSON serialization issue.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-01-08 16:45:15 -08:00
Santhosh Manohar 8ccf5cffa7 Vendoring libnetwork and its dependencies..
- replace /etc/hosts based name resolution with embedded DNS for user
  defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-08 14:13:21 -08:00
Tianon Gravi 335764a591 Merge pull request #19181 from coolljt0725/enable_build_syscall_test
Make .ensure-syscall-test to use build-arg
2016-01-08 13:43:38 -08:00
Phil Estes 557c7cb888 Move userns support out of experimental into master
Adds the `--userns-remap` flag to the master build

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-08 15:06:22 -05:00
Arnaud Porterie 05de2aadff Merge pull request #19001 from aboch/pip
Allow user to choose the IP address for the container
2016-01-08 11:49:20 -08:00
Jess Frazelle 1c979f7587 Merge pull request #18887 from riyazdf/notary-delegations
notary delegation integration into docker
2016-01-08 10:37:55 -08:00
David Calavera 145f020122 Vendor new syslog library with TLS support.
The syslog package in the stdlib is not maintained anymore.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-08 12:35:35 -05:00
Alessandro Boch 19b063e740 Vendoring libnetwork
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-08 09:19:31 -08:00
Riyaz Faizullabhoy 1c32a66877 update tests and error messages, revendor notary with tag
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-08 09:11:33 -08:00
Lei Jitang 3ff6725613 Make .ensure-syscall-test to use build-arg
.ensure-syscall-test need to build an image, we have
to add http_proxy and https_proxy to make it work.
Inseted of adding http_proxy and https_proxy env to the Dockerfile,
adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more
elegant.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-08 15:27:21 +08:00
Riyaz Faizullabhoy 1c125f50cf Notary delegation integration into docker
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-07 19:35:45 -08:00
David Calavera 1feeecf6e5 Vendor engine-api 0.1.3.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-07 21:02:19 -05:00
Avi Miller c64f9407a4 Add missing ? to specfile variable.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-08 11:06:21 +11:00
Jess Frazelle d76640d78a Merge pull request #19145 from vdemeester/vendor-my-precious
Add a validate-vendor script
2016-01-07 13:53:01 -08:00
Avi Miller 28f52bd06a Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-08 08:09:47 +11:00
Vincent Demeester 4c22c566e2 Add a validate-vendor script
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-07 19:57:50 +01:00
Tibor Vass 131e2bf12b Merge pull request #19068 from calavera/vendor_engine_api
Introduce the new engine-api library.
2016-01-07 11:14:37 -05:00
moxiegirl dd2981c26d Merge pull request #19127 from thaJeztah/use-the-f-luke
Add -f flag to cURL install instructions
2016-01-06 20:02:53 -08:00
David Calavera 9927e712c0 Vendor engine-api project.
Use latest tag for both, engine-api and go-connections.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-06 19:46:06 -05:00
David Calavera 4ee3048fa8 Merge pull request #19110 from brahmaroutu/update_openc
update runc to the latest code base to fix gccgo builds
2016-01-06 15:09:11 -08:00
Tianon Gravi 91201678c6 Refactor multi-arch support (especially for new mostly-official multi-arch official images)
See 99433d2ca2/README.md (architectures-other-than-amd64) for some context of where these images come from.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-06 14:34:29 -08:00
John Howard 676118670d Windows CI: More debugging
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-06 11:44:07 -08:00
Sebastiaan van Stijn 9cf29be0ee Add -f flag to cURL install instructions
From the -f description:

(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-06 16:05:16 +01:00
Srini Brahmaroutu 9982631707 update runc to the latest code base to fix gccgo build
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2016-01-06 00:02:56 +00:00
John Howard a3858873fa Windows CI: No integration daemon stop
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-05 10:52:59 -08:00
Vincent Demeester 0736598b93 Remove hello-world:latest tag before integration
This is to make sure we are in the same state on linux/arm, linux/… and
other architecture.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-05 14:40:27 +01:00
Jess Frazelle 78873dd6e5 Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script
Adding Jenkins CI script to sources
2016-01-04 15:59:03 -08:00
John Howard 8213f8caaa Adding Jenkins CI script to sources
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-04 15:53:30 -08:00
Jessica Frazelle 327421d1df
add more seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-30 17:30:44 -08:00
Jessica Frazelle 626c933730
cleanup jess/unshare image
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-30 16:20:05 -08:00
Arnaud Porterie 3858027e27 Merge pull request #18933 from coolljt0725/always_build
Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
2015-12-29 11:53:06 -08:00
Tianon Gravi 31bd242cba Merge pull request #18728 from hypriot/update-dockerfile-for-arm
update Dockerfile.arm to reflect latest changes in main Dockerfile
2015-12-29 09:24:29 -08:00
Lei Jitang 82051ab996 Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-12-29 04:09:44 -05:00
Jessica Frazelle 15674c5fb7
add docs and unconfined to run a container without the default seccomp profile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-28 10:26:51 -08:00
Jessica Frazelle a48fe62384
add default seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-28 10:26:48 -08:00
Sebastiaan van Stijn d4270c1764 Merge pull request #18775 from mrjana/mh
libnetwork vendoring
2015-12-26 11:42:55 +01:00
Arnaud Porterie 3e298c5928 Rename `-dirty` to `-unsupported`
Nightly and unofficial builds of Docker bear the suffix `-dirty` in the
version string. Change this suffix to `-unsupported` to make it explicit
that no support will be provided on such versions, and that it is for
example unnecessary to file an issue for it.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-12-24 09:11:49 -08:00
Daniel Nephin 3b8301b660 Upgrade go-units vendor to latest version with ulimits.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-23 13:27:58 -05:00
Daniel Nephin fcc24995e0 Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-22 18:59:47 -05:00
Jana Radhakrishnan f0904affd1 libnetwork vendoring
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436

Brings in:
    * Support for overlay network driver in 3.10+ kernels
    * Freebsd compilation fixes
    * Remove .dockerinit dependency
    * IPAM driver capability support
    * Network internal mode support
    * Misc. fixes

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-12-22 13:32:17 -08:00
David Calavera ad7fa01102 Vendor new connections library.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-22 13:31:46 -05:00
Sebastiaan van Stijn 814ce44d5a Don't build Darwin 32-bit binaries
The last 32-bit OS X computers were built in 2006,
so we probably don't need these anymore.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-22 00:08:18 +01:00
Sebastiaan van Stijn 325b1f35ae Remove Ubuntu 15.04 (Vivid) from DEB build as it will be EOL
Ubuntu 15.04 (Vivid) will be EOL'd in January,
so we should remove it from our builds in the
Docker 1.10 release.

For information about the EOL data, see:
https://wiki.ubuntu.com/Releases

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-20 16:00:53 +01:00
Sebastiaan van Stijn a08c955e30 Remove Fedora 21 from RPM build as it is EOL
Fedora 21 is EOL'd as of December 1st, 2015.

Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html

Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.

Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-20 00:42:17 +01:00
Stefan Scherer 94fb7458ea Move DOCKER_ENGINE_ envs to integration-daemon-setup to allow build w/o Makefile
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-12-17 18:55:45 +01:00
Govinda Fichtner 43ee564326 update Dockerfile to reflect latest changes
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-12-17 18:54:00 +01:00
Alexander Morozov f8140332c0 Merge pull request #18719 from jfrazelle/vendor-updates
update and run vendor script
2015-12-16 11:27:02 -08:00
David Calavera b44b5bbc8b Merge pull request #18682 from calavera/replace_units_package
Replace pkg/units with docker/go-units.
2015-12-16 10:48:59 -08:00
Jessica Frazelle a016ec6fd1
update and run vendor script
so there was weird whitespacing that got messed up the last time this was run, this fixes that and cleans up vendor helpers as well :)

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-16 09:58:20 -08:00
David Calavera 0609342d04 Vendor go-units and libcontainer.
Libcontainer depends on the new package now to avoid cycled
dependencies.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-16 12:25:54 -05:00
Jessica Frazelle 6636aec38a
cleanup hack/.vendor-helpers.sh
seccomp is already in $dockerBuildTags

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-15 15:50:10 -08:00
David Calavera b0f652fc38 Merge pull request #18648 from jfrazelle/fix-install-script-trusty
fix install script for ubuntu trusty
2015-12-15 12:55:01 -08:00
Tianon Gravi 42ea7a8a93 Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
Add support for installation on Kali Linux 2.0
2015-12-15 08:52:53 -08:00
Alexander Morozov 260cbb19c9 Merge pull request #18486 from aboch/vnd
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
2015-12-14 13:32:01 -08:00
Jessica Frazelle bdde4b32a1
fix install script for ubuntu trusty
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-14 13:13:39 -08:00
Alexander Morozov ecc3717cb1 Merge pull request #18612 from mrunalp/update_runc
Update runc/libcontainer to v0.0.6
2015-12-14 13:05:53 -08:00
Jess Frazelle 03e2923e42 Merge pull request #18570 from suihkulokki/control-fix
hack/make/.build-deb/control: add missing fields
2015-12-14 10:41:56 -08:00
Jess Frazelle b13fd10109 Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
Windows CI Fix: No subshell due to bash 3.x
2015-12-14 10:32:53 -08:00
Justas Brazauskas 927b334ebf Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
Mrunal Patel e8f7d5885d Update runc/libcontainer to v0.0.6
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-12-11 15:24:32 -05:00
Phil Estes 2ea48e9fc0 Merge pull request #18197 from nalind/workaround-go-libgcc
Work around a linking problem on 32-bit arches
2015-12-10 11:50:03 -05:00
Riku Voipio 8d2a423d87 control: add missing fields
Without section/priority, reprepro will reject the packages. Add
sections following the Debian docker.io packages

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
2015-12-10 16:57:39 +02:00
Qiang Huang bd00905614 Fix format issue
Remove prefix and suffix spaces and tabs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-10 15:18:16 +08:00
Alessandro Boch 8fe6b3835c Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-12-09 13:48:24 -08:00
John Howard e078adc93b Windows: No subshell due to bash 3.x
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-08 22:24:55 -08:00
David Calavera dead67308c Merge pull request #18435 from cilium-team/changing-udev-rules-file-permissions
Fixed 80-docker.rules file permissions to 644
2015-12-08 16:28:54 -08:00
Christopher Jones 03fc212b6d Fixes for ppc64le and 390x frozen-images
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-08 14:26:34 -05:00
Jess Frazelle 87a614ed55 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
2015-12-05 08:33:58 -08:00
André Martins 6eef5ab42d Fixed 80-docker.rules file permissions to 644
Signed-off-by: André Martins <aanm90@gmail.com>
2015-12-04 15:31:44 +00:00
Doug Davis c80d03db77 Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
Vendor distribution and fix inspect by sha256 prefix
2015-12-03 20:59:47 -05:00
Jessica Frazelle ed5853de40
update hack/vendor.sh scripts and run vendor
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:48 -08:00
Tonis Tiigi 53cd579b6e vendor: bump distribution to 568bf038af
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-03 13:36:31 -08:00
John Howard 2097e7fcee Windows CI Fix: Timeout change
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 12:45:56 -08:00
John Howard c10311bc9a Fix broken Windows CI
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-12-03 10:12:11 -08:00
Alexander Morozov 1475f567cb Merge pull request #18375 from vbatts/tar-split_update
vendor: update tar-split to v0.9.11
2015-12-02 20:25:07 -08:00
Sebastiaan van Stijn 6deec021e5 Merge pull request #18309 from WeiZhang555/time
Consolidate time format for API
2015-12-02 22:28:28 +01:00
Vincent Batts 919104e6bb vendor: update tar-split to v0.9.11
For optimizations.
https://github.com/docker/docker/issues/18370#issuecomment-161399901

Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-12-02 15:34:12 -05:00
Jess Frazelle 289251d088 Merge pull request #17769 from tianon/vendor-windows
Fix Windows support in .vendor-helpers.sh
2015-12-02 10:02:08 -08:00
Nalin Dahyabhai 800505729b Use -z,muldefs on arm,x86
Assume that the linker can make sense of us passing in the -z,muldefs
option to tell it to ignore symbol-multiply-defined errors triggered by
https://github.com/golang/go/issues/9510.  We should be able to stop
doing this once we move to Go 1.6.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2015-12-02 10:30:13 -05:00
Zhang Wei 9daca1222a Consolidate time format for API
Consolidate all the API to same time format: RFC3339, and it will be
client's responsibility to present it in more user friendly way.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-02 22:40:18 +08:00
Phil Estes da0c9286a9 Merge pull request #18315 from jfrazelle/change-frozen-image-v2
update download-frozen-image.sh to v2 registry
2015-12-01 17:12:00 -05:00
Jessica Frazelle 359d0c247f
update download-frozen-image.sh to v2 registry
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-01 13:16:42 -08:00
Jessica Frazelle 09d448f924
add licence to rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 15:19:31 -08:00
Jessica Frazelle 4935f7f500
fix gopath when building debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 13:44:59 -08:00
Zhang Wei a7b73e57bc Golint auto-generated file
Fix auto-generation script to golint auto-generated files.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-30 16:34:07 +08:00
Antonio Murdaca 65900d7603 vendor: bump deps
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-26 16:29:59 +01:00
Antonio Murdaca a1733c6575 hack: make: .go-autogen: add blank line after build tag
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-26 13:16:39 +01:00
Martin Kelly 3e5ac74241 install.sh: fix for multiarch deb/ubuntu
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.

Fix this by qualifying the repo line with the currently active
architecture.

This fixes issue #18207.

Signed-off-by: Martin Kelly <martin@surround.io>
2015-11-24 16:53:13 -08:00
Tianon Gravi ae1fadeb96 Merge pull request #17714 from mikedougherty/cs-release-fixes
Fixes for release scripts
2015-11-23 19:47:10 -08:00
Mike Dougherty a15b67b1af Fixes for release scripts:
Add a flag to allow keeping bundles around (helps with CI)

Fix several problems in repo make targets

* quote DOCKER_EXPERIMENTAL variable
* pass-through arguments for gpg  provided to dpkg-sig are now quoted
  properly, so passphrases with shell-interpolated symbols can be used
* when determining deb suites, don't rely on 'origin' to be
  github.com/docker/docker

Fix some issues with deb repository creation from scratch

* Don't add empty components to the repository configuration as they
  will cause failure when generating.

Add old docker-engine-cs name to package conflicts

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2015-11-23 17:15:54 -08:00
Michael Crosby 249b3a9479 Merge pull request #17459 from brahmaroutu/Power_Z_CI
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
2015-11-19 15:50:07 -08:00
Madhu Venugopal 423b55c4b4 Fixed an endpoint delete issue with a possible stale sbox
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-19 12:46:37 -08:00
Brian Torres-Gil 9c1ccf7084 Add support for installation on Kali Linux 2.0
Signed-off-by: Brian Torres-Gil <btorres-gil@paloaltonetworks.com>
2015-11-19 11:18:28 -08:00
Michael Crosby 7147ac6ce7 Merge pull request #18023 from LK4D4/goodbye_dind
Remove cgroup mounting in dind
2015-11-17 15:12:08 -08:00
Tianon Gravi 7f608c391d Prevent the creation of "a.out" at the repo root
Our clever "gcc" invocations were creating a spurious "a.out" file at the root of the repo (which just happened to be in ".gitignore" so we didn't notice it sooner).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-17 09:44:36 -08:00
Alexander Morozov 71f422435e Merge pull request #17999 from tianon/linkmode-external
Remove "-linkmode external"
2015-11-17 08:33:32 -08:00
Jess Frazelle 1c8d8b3012 Merge pull request #17803 from hypriot/17802-add-initial-support-for-docker-on-arm
Add initial support for Docker on ARM
2015-11-17 16:52:54 +01:00
Alexander Morozov 81aa1b507f Remove cgroups mounting in dind
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-16 17:10:53 -08:00
Tianon Gravi 927e1e98b7 Remove "-linkmode external"
We're having to override it in so many places that it no longer seems worthwhile to bother.  On top of that, the reason we did it in the first place was for being able to compile devicemapper statically, which still works after this change (either due to other changes in the way we build, or improvements in Go itself).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-15 14:47:48 -08:00
Govinda Fichtner b74fd0628a Add initial support for Docker on ARM
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-11-15 13:15:31 +01:00
Tibor Vass 586152523d Merge pull request #17987 from jfrazelle/correct-ltdl
Correct ltdl and fix experimental macro for rpms
2015-11-15 03:46:23 +01:00
Jessica Frazelle 38724c80ab
fix experimental boolean macro
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-14 14:47:13 -08:00
Alexander Morozov fb77b822ad Merge pull request #17758 from rhatdan/dynbinary
Since default is dynbinary we should test with dynbinary
2015-11-14 10:54:03 -08:00
Arnaud Porterie 7a6f2cdeeb Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
New version of notary with pkcs11 client integration
2015-11-14 12:03:29 +01:00
Dan Walsh 0d47b74a7f Since default is dynbinary we should test with dynbinary
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-14 06:01:55 -05:00
Antonio Murdaca dc136b710b Merge pull request #17211 from endocode/kayrus/docker_fd_https
Added possibility to use TLS with systemd socket activation
2015-11-14 08:36:54 +01:00
Srini Brahmaroutu b1cc78b8f5 Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-11-14 03:16:45 +00:00
Jessica Frazelle 6c818f3e5f
update for mac
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:54 -08:00
Jessica Frazelle cf4c3da725
update debs/rpms for pkcs11 yubikey things
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:53 -08:00
Jessica Frazelle 141369457f
add buildtag pkcs11 to experimental
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:20:49 -08:00
Jessica Frazelle 94ea6af8cd
update vendor.sh and notary api for vendored changes
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-13 13:19:11 -08:00
kayrus 0f2b3191d9 Added possibility to use TLS with systemd socket activation
Signed-off-by: kayrus <kay.diam@gmail.com>
2015-11-13 17:01:23 +01:00
Tianon Gravi 8b9856dbd7 Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
update release script and release process
2015-11-12 09:51:36 -08:00
David Calavera eed704f7d9 Merge pull request #17901 from runcom/remove-not-needed-func
hack: make.sh: remove not used function
2015-11-12 07:16:43 -08:00
Antonio Murdaca dc41fff56e hack: make.sh: remove not used function
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-11 10:19:03 +01:00
Alessandro Boch 43b3b6ecb4 Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-10 21:13:25 -08:00
Tibor Vass 09980ef7ac Merge pull request #17853 from aboch/ipr
Fix fixed-cidr daemon option
2015-11-10 23:38:33 -05:00
Paolo G. Giarrusso c5f24c7902 Fix link to installation instructions
Fix #17872:

> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/, which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
2015-11-10 18:06:58 +01:00
Alessandro Boch 9c395537bc Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
- To bring in ip-range fix

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-09 15:29:54 -08:00
David Calavera 58b270c338 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
Another try at dockerversion placeholder for library import
2015-11-09 13:15:50 -08:00
Vincent Demeester e509fe604c Merge pull request #17816 from coolljt0725/remove_execdriver_env
Remove DOCKER_EXECDRIVER env
2015-11-09 19:59:18 +01:00
Vincent Demeester 8054a30387 dockerversion placeholder for library import
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-09 19:32:46 +01:00
Alexander Morozov 00bcc924fa Update runc to introduce RelabelNeeded function
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 10:03:25 -08:00
Lei Jitang 3c4dab51d3 Remove DOCKER_EXECDRIVER env
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.

Signed-off-by: Lei Jitang <leijiang@huawei.com>
2015-11-09 09:17:32 +08:00
Jess Frazelle ea59233eb1 Merge pull request #16533 from justsml/LMDEv2
LMDE check added to `check_forked()` function - See #16498
2015-11-08 02:28:11 -08:00
Vincent Demeester e2a9eede28 Merge pull request #17786 from Microsoft/10662-nativetestunit
Windows: Native make test-unit
2015-11-08 11:12:09 +01:00
John Howard 7268f767e6 Windows: Native make test-unit
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:23:10 -08:00
David Calavera efc7b9bbf7 Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild
Windows: Native build without link errors
2015-11-07 08:22:35 -08:00
John Howard d92f7f42b2 Windows: Native daemon build
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:35:56 -08:00
John Howard 33faea576f Windows: Fix test-unit for local run
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:23:48 -08:00
Tianon Gravi 1c383af6ae Fix Windows support in .vendor-helpers.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-11-06 12:07:24 -08:00
Solomon Hykes 2519f46550 Merge pull request #17700 from calavera/remove_lxc
Remove LXC support.
2015-11-05 15:22:37 -08:00
David Calavera 98ec6bc14c Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
Fix panic in parsing /etc/os-release
2015-11-05 15:11:02 -08:00
David Calavera 157b66ad39 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
David Calavera 3b5fac462d Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:57 -05:00
Jess Frazelle 31fa27d47e Merge pull request #17496 from chasebolt/centos-rpm-dep
setting device-mapper-libs version dependency for centos 7 rpm
2015-11-05 13:46:27 -08:00
Vincent Demeester b09a452c1f Vendor mattn/go-shellwords
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-05 19:59:28 +01:00
Vincent Demeester f267e4be54 Merge pull request #17697 from jfrazelle/test-old-apt-repo
add script to test the old apt-repo
2015-11-05 12:11:57 +01:00
Jessica Frazelle d0a4b216a6
update release script and release process
Signed-off-by: Jessica Frazelle <princess@docker.com>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-04 16:20:04 -08:00
Jessica Frazelle 3f27479435
add script to test the old apt-repo
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-04 16:01:19 -08:00
Alexander Morozov b2f14f9bec Merge pull request #17639 from mrjana/restart
Fix a corner case issue when daemon panics
2015-11-04 13:37:45 -08:00
Srini Brahmaroutu 81b3d2eec9 after the changes to unit test framework, fixing gccgo to run unit tests
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-11-03 17:57:06 +00:00
kayrus 0a6acbede3 Updated vendor go-systemd with enabled TLS activation
Signed-off-by: kayrus <kay.diam@gmail.com>
2015-11-03 11:02:05 +01:00
Jana Radhakrishnan 79cffa5ce4 Fix a corner case issue when daemon panics
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.

Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-11-02 18:37:35 -08:00
Derek McGowan 6964f42350 Merge pull request #17557 from aaronlehmann/update-distribution
Vendor updated version of docker/distribution
2015-11-02 14:37:04 -08:00
Aaron Lehmann 257c59251b Vendor updated version of docker/distribution
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-02 12:40:18 -08:00
David Calavera b95048758a Merge pull request #17619 from jfrazelle/canonical-update
rebased canonical/json off go 1.5.1
2015-11-02 11:42:26 -08:00
David Calavera f962c0715f Merge pull request #17620 from vdemeester/unit-test-TESTDIRS
Bring TESTDIRS back for unit-tests
2015-11-02 11:41:19 -08:00
Vincent Demeester 4a54ab387f Add TESTDIRS back
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-11-02 19:44:09 +01:00
Jessica Frazelle 0d881349e8
rebased canonical/json off go 1.5.1
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-02 10:23:02 -08:00
Jana Radhakrishnan 10e1b9f02e Vendoring libnetwork
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-11-02 08:33:52 -08:00
Madhu Venugopal 2361edbcea Vendoring in libnetwork to fix an ungraceful restart case
Also picked up a minor typo fix

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-30 16:24:02 -07:00
Brian Goff 17a8fbeaeb Merge pull request #17514 from mavenugo/ugr
Fixing a case of dangling endpoint during ungraceful daemon restart
2015-10-30 13:38:27 -04:00
Tibor Vass c545dce004 Merge pull request #16640 from samuelkarp/awslogs-logging-driver
[awslogs] Auto-detect region and set user-agent
2015-10-30 12:38:40 -04:00
Madhu Venugopal ebf76171f6 Vendoring libnetwork to solve an ungraceful restart condition
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-29 18:56:17 -07:00
Jess Frazelle d30caedbf8 Merge pull request #17491 from LK4D4/seq_tests
Run unit tests as single command
2015-10-29 16:29:24 -07:00
Chase Bolt d8aaf96216 expand the list a bit more
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
2015-10-29 15:23:44 -07:00
Alexander Morozov 7f7950aa18 Merge pull request #17490 from aboch/pm
Libnetwork vendoring & overlay networking fixes
2015-10-29 13:45:19 -07:00
Chase Bolt 787d94626f setting device-mapper-libs version dependency for centos 7 rpm
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
2015-10-29 11:11:19 -07:00
Alexander Morozov 1c23de0e64 Run unit tests as single command
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-29 09:39:51 -07:00
Alessandro Boch 90744fe943 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-29 09:24:48 -07:00
Doug Davis b6e1f4dd69 Merge pull request #16898 from hqhq/hq_bump_bolt
Bump bolt to v1.1.0
2015-10-28 18:51:23 -04:00
Tibor Vass 8db141049f docker-py: upgrade and fix test script
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-28 12:56:50 -04:00
Jess Frazelle 96a6e810de Merge pull request #17418 from diogomonica/bump-go-1.5
Bump go 1.5
2015-10-27 20:12:43 -07:00
Brian Goff b78ca243d9 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-27 21:23:53 -04:00
Qiang Huang a41917c2c8 Bump bolt to v1.1.0
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-10-28 08:49:45 +08:00
Samuel Karp 70083e6fc3 Update vendored aws-sdk-go
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-10-27 23:43:51 +00:00
Jessica Frazelle 9bcbb39fa8
update to binaries, fix parsers package, non-parallel test unit
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-27 14:43:25 -07:00
David Calavera 6276c676a8 Merge pull request #17350 from vdemeester/11699-auto-libraryimport
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
Vincent Demeester d5cd032a86 dockerversion placeholder for library-import
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
David Calavera 91de5ddf18 Merge pull request #17381 from mavenugo/rc3v1
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
2015-10-26 17:06:01 -07:00
David Calavera fe1e04a84f Merge pull request #17285 from Microsoft/10662-exectp4workaround
Windows [TP4] Trap Hyper-V exec failure
2015-10-26 16:47:51 -07:00
Sebastiaan van Stijn 9312a738d8 Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
apparmor check version on deb install
2015-10-26 22:44:11 +01:00
Madhu Venugopal 139d1e13e2 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-26 13:56:56 -07:00
Santhosh Manohar 1041f39670 Vendor in libnetwork changes to support container rename
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2015-10-23 16:27:03 -07:00
John Howard a3c43964cf Windows [TP4] HCSShim Revendor
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-23 08:41:30 -07:00
Madhu Venugopal 793b20ba09 Vendoring in libkv to be aligned with libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-22 14:12:46 -07:00
Madhu Venugopal 52df87ac2b Vendoring in Libnetwork
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-22 14:12:46 -07:00
David Calavera 2afdc6582b Merge pull request #17274 from aboch/ai
Turn off discovery when icc == false
2015-10-22 13:08:31 -07:00
Jess Frazelle af6743a6c6 Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest
RPM change install location of Fish completions
2015-10-21 14:36:50 -07:00
Jess Frazelle 08fb495975 Merge pull request #17145 from thaJeztah/deb-add-fish-completions
deb: add fish completions
2015-10-21 13:58:22 -07:00
Tibor Vass 420e07cc2c release: fix bash bug in script
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-21 16:02:14 -04:00
Alessandro Boch 1be540b99b Vendoring in libnetwork for the anonymous endpoint
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761

Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-21 09:32:48 -07:00
Tibor Vass bb5551746b Merge pull request #17229 from mavenugo/ds_fix
Fixing bootup inconsistencies due to invalid cluster-store config
2015-10-21 12:00:07 -04:00
Madhu Venugopal 2de2192c27 Vendoring in libnetwork to fix daemon bootup instabilities
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-20 19:56:59 -07:00
David Lawrence 43ba8a0426 some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2015-10-20 13:22:06 -07:00
David Calavera a7868191d4 Merge pull request #17188 from jfrazelle/fix-release-rpm
fix copy of multiple rpms
2015-10-20 11:31:35 -07:00
Jana Radhakrishnan 9750dd0088 Vendoring libnetwork
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-19 21:29:26 -07:00
Jessica Frazelle 14e85c8c55
add test script for built debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-19 16:15:27 -07:00
Jessica Frazelle 8369f00d30
add generate aa profile to deb install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-19 16:15:25 -07:00
Jessica Frazelle f549b1c9ea
fix copy of multiple rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-19 16:14:06 -07:00
Sebastiaan van Stijn 6b1a643ac8 deb: add fish completions
This adds the Fish completions to the .deb package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-17 23:28:11 -07:00
Sebastiaan van Stijn fb372e66bb RPM change install location of Fish completions
External completions for fish should be installed
in /usr/local/share/fish/vendor_completions.d to
not conflict with built-in completions.

for reference, see:
https://github.com/fish-shell/fish-shell/issues/1485

fixes #16668

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-10-17 22:58:09 -07:00
Sebastiaan van Stijn cffd50752c Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
Vendoring new go-check checkers and use checker for docker_api_build_test.go
2015-10-17 08:50:51 -07:00
Vincent Demeester 9685b4767f Vendoring shakers library and update go-check
The shakers library defines a bunch of go-check checkers to ease
writing tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-17 14:28:08 +02:00
Sebastiaan van Stijn e3fabf3ea1 Merge pull request #16831 from jfrazelle/release-updates
Release updates
2015-10-16 16:57:10 -07:00
Tibor Vass 365a0db0f0 Merge pull request #17046 from mavenugo/dopts
driver-opts for network create
2015-10-16 15:23:59 -07:00
David Calavera 3668be932e Merge pull request #16574 from Djelibeybi/rpm-changelog
Generate a full RPM changelog from the existing CHANGELOG.md file
2015-10-16 14:55:39 -07:00
Madhu Venugopal cf1b5fe601 Vendoring libnetwork to Replace the label variable to DriverOpts
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-16 14:30:57 -07:00
David Lawrence 7ce9f02751 updating notary and gotuf with latest bugfixes
Signed-off-by: David Lawrence <david.lawrence@docker.com>
2015-10-16 09:33:26 -07:00
David Calavera e1804098b9 Merge pull request #16997 from Microsoft/10662-kill-parttwo
Windows: [TP4] docker kill handling part two
2015-10-15 14:42:19 -07:00
Jess Frazelle b22f89cb77 Merge pull request #16221 from flavio/get-docker-update-suse-installation
Update SUSE/openSUSE installation script
2015-10-14 13:02:45 -07:00
Flavio Castelli 400ac8a66c Update SUSE/openSUSE installation script
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.

Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2015-10-14 20:55:28 +02:00
Michael Crosby 3ad9cc996a Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
2015-10-13 16:56:19 -07:00
John Howard bc503ca8ab Windows: [TP4] docker kill handling
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-13 16:04:49 -07:00
Tibor Vass 9c94dcea3d Merge pull request #16863 from dhiltgen/bump_libkv
Bump to latest libkv + dependencies
2015-10-13 15:57:42 -07:00
Tibor Vass a17e53038d Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-13 15:48:13 -07:00
Jessica Frazelle 3057f0f0a7 update release-deb from the reprepro stuff we don't use
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-13 15:42:39 -07:00
Daniel Hiltgen 7078e7ddf4 Bump to latest libkv/libnetwork + dependencies
The latest libkv uses a different etcd library.  Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2015-10-13 14:41:43 -07:00
Alexandre Beslic 4ea3ff7061 Merge pull request #16910 from mavenugo/ipam
Vendoring libnetwork for the pluggable IPAM driver support
2015-10-13 14:41:19 -07:00
Madhu Venugopal 2e3113aeef Vendoring in libnetwork ipam support
* Pluggable IPAM driver support
* Performance and Scalability enhancements
* Libkv fixes in multiple backend stores

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-13 10:52:49 -07:00
Sven Dowideit 4e899d64e0 Missing a single dash in error message
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-11 22:46:14 -07:00
Arnaud Porterie ed9434c5bb Merge pull request #12648 from estesp/userns-impl
Phase 1 implementation of user namespaces as a remapped container root
2015-10-10 11:38:07 -07:00
Sebastiaan van Stijn a6bbf16aa1 Merge pull request #16895 from vdemeester/ocd-validate-typo
Fix few comments in validate scripts
2015-10-10 12:08:37 +02:00
Vincent Demeester 1ce9be346b Fix few comments in validate scripts
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-10 11:21:04 +02:00
Jessica Frazelle 930b27a86b fix logic because jess is the worst
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 22:21:24 -04:00
Phil Estes a85e6a4d4a Update integration test userns support with flag name change
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 20:52:45 -04:00
Jessica Frazelle ea3afdad61 add test-integration-cli specifics for userns
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 20:50:27 -04:00
Alexander Morozov 90e733f0b1 Merge pull request #16867 from dmcgowan/distribution-upstream-name-change
Update distribution package for name regexp change
2015-10-09 10:09:23 -07:00
Derek McGowan b5b0da5fec Update distribution package
Pick up name regexp change in distribution to allow matching of hostnames as a valid component of a repository.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-10-08 17:16:43 -07:00
Brian Goff d9f5f1954c Bump runc
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-08 17:07:00 -04:00
Jessica Frazelle 96559aaef2
add clean apt db to release script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-08 09:21:20 -07:00
Jessica Frazelle 0aee0b1f9e
add script to generate index listing for the repo if say hosted on s3
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-08 09:21:16 -07:00
Antonio Murdaca 7539013436 bump libcontainer to 902c012e85cdae6bb68d8c7a0df69a42f818ce96
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
2015-10-06 17:55:09 +02:00
Arnaud Porterie 33e9d70c82 Merge pull request #16718 from mavenugo/discovery
Vendoring libnetwork integrated with Docker discovery service
2015-10-05 12:06:36 -07:00
Tianon Gravi 0339ed787c Merge pull request #16747 from vdemeester/docs-testdirs
Update test-and-docs with TESTDIRS
2015-10-05 10:39:56 -07:00
Vincent Demeester fbd0cea90c Remove use of testify mock and testify vendored lib
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-05 08:43:34 +02:00
Vincent Demeester 0542939f40 Update test-and-docs with TESTDIRS
… and fix the rendering of `make test-unit` with TESTDIRS :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 21:19:04 +02:00
Madhu Venugopal 956fbccdaa Vendoring in libnetwork integrated with Docker Discovery
This commit brings in end to end integration of Docker Discovery with
libnetwork multi-host networking.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-02 13:07:44 -07:00
Jessica Frazelle cb0ce5bb76
fix release script gpg key id
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-01 13:22:33 -07:00
Phil Estes b7a009cc1c Update runc to fba07bce72e72ce5b2dd618e4f67dd86ccb49c82
Fixing user namespaces (again) with a vendor update from runc
(specifically, the remount() only if special flags change)

Other changes are very minimal.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-09-30 15:33:23 -04:00
Srini Brahmaroutu 81c42d6c1e Vendor in stretchr/testify to fix GCCGO issue with function name parsing
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-09-29 19:20:03 +00:00