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
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
acb42c5fab
Enable DockerTrustSuite for ARM again
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-20 14:58:09 +01:00
87b7ff5267
Merge pull request #19465 from mavenugo/sysd
...
Vendor libnetwork v0.6.0-rc1
2016-01-20 09:02:21 +01:00
7657e233f7
Merge pull request #19466 from aaronlehmann/vendor-distribution
...
Vendor updated docker/distribution package
2016-01-19 21:05:43 -05:00
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
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
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
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
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
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
011ca5f206
Merge pull request #19426 from sanimej/restart
...
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
2016-01-19 10:28:33 +01:00
637f49b5af
Merge pull request #19196 from Microsoft/jjh/tp4ci
...
Windows CI: Setup for testing against Windows
2016-01-18 15:22:08 -08:00
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
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
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
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
790e648c06
Merge pull request #19340 from Microsoft/jjh/rsrcfix
...
Windows: Remove linkmode internal hack
2016-01-15 14:10:56 -08:00
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
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
4c89b1f72c
Merge pull request #19355 from riyazdf/notary-revendor
...
notary revendor into docker
2016-01-15 01:02:35 -08:00
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
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
94b2d56690
Merge pull request #19109 from BrianBland/crossRepositoryPush
...
Cross repository push
2016-01-14 18:50:53 -05:00
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
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
6ca5a2c476
Windows: Remove linkmode internal hack
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 13:09:28 -08:00
db2b5e647c
Merge pull request #19338 from aboch/vnd
...
Vendoring libnetwork v0.5.5
2016-01-14 13:02:20 -08:00
7a44265129
Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog
...
Remove the changelog auto-generation
2016-01-14 12:47:32 -08:00
5347f7cd94
Vendoring libnetwork v0.5.6
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-14 10:48:48 -08:00
4e4ba9dd3a
Vendoring libnetwork v0.5.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-14 10:34:00 -08:00
1666707cf8
Vendor merge structure tool.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 11:58:38 -05:00
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
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
7a5d897410
Vendor engine-api 0.2.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-13 20:09:47 -05:00
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
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
46eb470039
Merge pull request #19267 from mavenugo/vin-ln
...
Vendor libnetwork v0.5.4
2016-01-13 07:09:58 -05:00
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
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
ca60e6262b
Vendor engine-api 0.2.1.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-12 13:19:16 -05:00
c72be040bb
Merge pull request #19187 from estesp/lets-do-this
...
User namespaces: graduate from experimental
2016-01-12 09:34:19 -08:00
656979670c
Merge pull request #18998 from calavera/syslog_tls
...
Allow syslog over TCP+TLS.
2016-01-11 17:21:38 -08:00
df40c61f8a
Make Makefile work on OS X
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-11 18:16:56 -05:00
f11b6a2ab3
Merge pull request #18785 from aaronlehmann/new-manifest
...
New image manifest format
2016-01-11 12:01:46 -08:00
a4b77dc1af
Windows CI: Setup for testing against Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-11 11:52:03 -08:00
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
ad2966a315
Merge pull request #19138 from Microsoft/jjh/failedtodockerversion
...
Windows CI: More debugging
2016-01-10 18:11:19 -08:00
fe3d1f9dd7
Merge pull request #19198 from sanimej/vin
...
Vendoring libnetwork
2016-01-10 11:46:34 -08:00
290ba41c00
Vendor updated github.com/docker/distribution
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-08 17:24:20 -08:00
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
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
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
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
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
1c979f7587
Merge pull request #18887 from riyazdf/notary-delegations
...
notary delegation integration into docker
2016-01-08 10:37:55 -08:00
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
19b063e740
Vendoring libnetwork
...
- 49c24217054e269aad3dbfd81ee32780b104dd84
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-08 09:19:31 -08:00
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
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
1c125f50cf
Notary delegation integration into docker
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-07 19:35:45 -08:00
1feeecf6e5
Vendor engine-api 0.1.3.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-07 21:02:19 -05:00
c64f9407a4
Add missing ? to specfile variable.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-08 11:06:21 +11:00
d76640d78a
Merge pull request #19145 from vdemeester/vendor-my-precious
...
Add a validate-vendor script
2016-01-07 13:53:01 -08:00
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
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
131e2bf12b
Merge pull request #19068 from calavera/vendor_engine_api
...
Introduce the new engine-api library.
2016-01-07 11:14:37 -05:00
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
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
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
91201678c6
Refactor multi-arch support (especially for new mostly-official multi-arch official images)
...
See 99433d2ca2/README.md (architectures-other-than-amd64)
2016-01-06 14:34:29 -08:00
676118670d
Windows CI: More debugging
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-06 11:44:07 -08:00
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
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
a3858873fa
Windows CI: No integration daemon stop
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-05 10:52:59 -08:00
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
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
8213f8caaa
Adding Jenkins CI script to sources
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-04 15:53:30 -08:00
327421d1df
add more seccomp profile tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-30 17:30:44 -08:00
626c933730
cleanup jess/unshare image
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-30 16:20:05 -08:00
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
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
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
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
a48fe62384
add default seccomp profile tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-28 10:26:48 -08:00
d4270c1764
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
2015-12-26 11:42:55 +01:00
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
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
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
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
ad7fa01102
Vendor new connections library.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-22 13:31:46 -05:00
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
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
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
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
43ee564326
update Dockerfile to reflect latest changes
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-12-17 18:54:00 +01:00
f8140332c0
Merge pull request #18719 from jfrazelle/vendor-updates
...
update and run vendor script
2015-12-16 11:27:02 -08:00
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
Alexander Morozov
David Calavera
Jessica Frazelle
Vincent Demeester
Stefan Scherer
Tibor Vass
Michael Crosby
Madhu Venugopal
Aaron Lehmann
Christopher Jones
Jess Frazelle
Santhosh Manohar
Phil Estes
Qiang Huang
Riyaz Faizullabhoy
Sebastiaan van Stijn
Brian Bland
Tianon Gravi
John Howard
Alessandro Boch
Avi Miller
Brian Goff
Tibor Vass
Arnaud Porterie
cyli
Phil Estes
Lei Jitang
moxiegirl
Sebastiaan van Stijn
Srini Brahmaroutu
Daniel Nephin
Jana Radhakrishnan
Govinda Fichtner