Commit Graph

1172 Commits

Author SHA1 Message Date
03dfb7ff42 Re-vendoring notary in order to deal with a canonical JSON serialization issue.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 5719b136dec7b2c3e76059cf9226a1b388a772f6
Component: engine
2016-01-08 16:45:15 -08:00
b4fe367544 Merge pull request #19181 from coolljt0725/enable_build_syscall_test
Make .ensure-syscall-test to use build-arg
Upstream-commit: 335764a5913900283a489ef771013041ffba7230
Component: engine
2016-01-08 13:43:38 -08:00
783f31c7b2 Merge pull request #19001 from aboch/pip
Allow user to choose the IP address for the container
Upstream-commit: 05de2aadff97be0ffe8a3ed0cf4ac363d291488f
Component: engine
2016-01-08 11:49:20 -08:00
61116ea963 Merge pull request #18887 from riyazdf/notary-delegations
notary delegation integration into docker
Upstream-commit: 1c979f758753d921ced122dec3953ddbc35ee67f
Component: engine
2016-01-08 10:37:55 -08:00
f1d228a431 Vendoring libnetwork
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 19b063e740c8140c70bac65179f944422538babc
Component: engine
2016-01-08 09:19:31 -08:00
1ce594cbcd update tests and error messages, revendor notary with tag
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c32a66877f2ddc3f1cce66d78c69e032d6cf795
Component: engine
2016-01-08 09:11:33 -08:00
6c33dca6bb 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>
Upstream-commit: 3ff67256132febad4d039845e97db2ad4d55025d
Component: engine
2016-01-08 15:27:21 +08:00
b741751f8d Notary delegation integration into docker
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c125f50cfce422b19a15e84c5a3940890fb2e23
Component: engine
2016-01-07 19:35:45 -08:00
14985d55be Vendor engine-api 0.1.3.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1feeecf6e58c3690347efed9c0712a698ff426f0
Component: engine
2016-01-07 21:02:19 -05:00
f22c8d297c Merge pull request #19145 from vdemeester/vendor-my-precious
Add a validate-vendor script
Upstream-commit: d76640d78a1a14b1f7f772c100a95cacfd30248c
Component: engine
2016-01-07 13:53:01 -08:00
40d1466ce7 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>
Upstream-commit: 4c22c566e25ff2bc6fa80cd9627c59512a1f768d
Component: engine
2016-01-07 19:57:50 +01:00
3ccd6b28f2 Merge pull request #19068 from calavera/vendor_engine_api
Introduce the new engine-api library.
Upstream-commit: 131e2bf12b2e1b3ee31b628a501f96bbb901f479
Component: engine
2016-01-07 11:14:37 -05:00
e1187bdd34 Merge pull request #19127 from thaJeztah/use-the-f-luke
Add -f flag to cURL install instructions
Upstream-commit: dd2981c26dba1f6d87a2099b886c87aec259031d
Component: engine
2016-01-06 20:02:53 -08:00
e49de6ef58 Vendor engine-api project.
Use latest tag for both, engine-api and go-connections.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9927e712c0c5a04c2d802e160e27d3c16c650cf2
Component: engine
2016-01-06 19:46:06 -05:00
f720f8755b Merge pull request #19110 from brahmaroutu/update_openc
update runc to the latest code base to fix gccgo builds
Upstream-commit: 4ee3048fa8382f9e9af2418029b8e53885bb906a
Component: engine
2016-01-06 15:09:11 -08:00
0cad98a56c 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>
Upstream-commit: 9cf29be0ee0b19c25471c19c224f9af150beaf1e
Component: engine
2016-01-06 16:05:16 +01:00
4da63ae80d update runc to the latest code base to fix gccgo build
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 998263170750ee5504bc4fe23f9a3d1f797e2a41
Component: engine
2016-01-06 00:02:56 +00:00
cf47068ecd Windows CI: No integration daemon stop
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3858873fa87ff5b209e89e70d127d822efc42a6
Component: engine
2016-01-05 10:52:59 -08:00
907be2c8ba 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>
Upstream-commit: 0736598b93d7bc94b376c61ada17658dddee9aa3
Component: engine
2016-01-05 14:40:27 +01:00
16edb9ca77 Merge pull request #18461 from Microsoft/jjh/checkin-jenkins-script
Adding Jenkins CI script to sources
Upstream-commit: 78873dd6e57c142ab286a0822a5d61491ac8d383
Component: engine
2016-01-04 15:59:03 -08:00
1a2c2c2776 Adding Jenkins CI script to sources
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8213f8caaaebbe1627a8efc5b4aac8511f2da9aa
Component: engine
2016-01-04 15:53:30 -08:00
902a67f4ef add more seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 327421d1df557e156b29d14359a2bfdc59cfb46f
Component: engine
2015-12-30 17:30:44 -08:00
b985b8195a cleanup jess/unshare image
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 626c933730cffb6ca9112271dc4df5a1e462cac1
Component: engine
2015-12-30 16:20:05 -08:00
33e38a216c Merge pull request #18933 from coolljt0725/always_build
Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
Upstream-commit: 3858027e27bb57457b641634afc8ffb1f3630884
Component: engine
2015-12-29 11:53:06 -08:00
bc8b9546fd Merge pull request #18728 from hypriot/update-dockerfile-for-arm
update Dockerfile.arm to reflect latest changes in main Dockerfile
Upstream-commit: 31bd242cba2eea84b3690e7b0f00864dd780a1af
Component: engine
2015-12-29 09:24:29 -08:00
61fe2fe7ce Add DOCKER_BUILD_ARGS env to pass build-arg for building deb and rpm
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82051ab996910993c655fe2551fc84df592c4b81
Component: engine
2015-12-29 04:09:44 -05:00
3f03a2c89c add docs and unconfined to run a container without the default seccomp profile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 15674c5fb74df00d7560fb35619a5372ea2ee74e
Component: engine
2015-12-28 10:26:51 -08:00
aac8048807 add default seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a48fe6238494547f392b06adf9d48944b4dd8ac3
Component: engine
2015-12-28 10:26:48 -08:00
3dd9453e30 Merge pull request #18775 from mrjana/mh
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01:00
29a743c21a 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>
Upstream-commit: 3e298c5928d0a2cbf5e1b374783ce59de2076637
Component: engine
2015-12-24 09:11:49 -08:00
889a0e3758 Upgrade go-units vendor to latest version with ulimits.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3b8301b6600855e348bf4eeacabe5059f52e9d99
Component: engine
2015-12-23 13:27:58 -05:00
85924c9d77 Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fcc24995e0a4ad99c1a6dc445a8c6ff94df55c7c
Component: engine
2015-12-22 18:59:47 -05:00
663db95ac5 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>
Upstream-commit: f0904affd127ea8bdebfc3f3c586f8eb38e91da5
Component: engine
2015-12-22 13:32:17 -08:00
d6be4062df Vendor new connections library.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ad7fa0110206de6ff53825afb17cb8bbf181785d
Component: engine
2015-12-22 13:31:46 -05:00
73614850c7 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>
Upstream-commit: 814ce44d5ad442b940e44b41eff00bac0e579fc6
Component: engine
2015-12-22 00:08:18 +01:00
d095d83f03 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>
Upstream-commit: 325b1f35ae7419cd7454800c8eda4dfaca1d9a77
Component: engine
2015-12-20 16:00:53 +01:00
8d399a7fd9 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>
Upstream-commit: a08c955e30d6790d1f69483d5e33e2a81a08b100
Component: engine
2015-12-20 00:42:17 +01:00
717469465c Move DOCKER_ENGINE_ envs to integration-daemon-setup to allow build w/o Makefile
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 94fb7458eae64ad58853bf7170790848c8979af9
Component: engine
2015-12-17 18:55:45 +01:00
bd0f152278 update Dockerfile to reflect latest changes
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
Upstream-commit: 43ee5643261f9b8741ab23a1749b3d55e13171c5
Component: engine
2015-12-17 18:54:00 +01:00
5fc03c3956 Merge pull request #18719 from jfrazelle/vendor-updates
update and run vendor script
Upstream-commit: f8140332c0ea83a0821550452ed0aa26e2df3b3b
Component: engine
2015-12-16 11:27:02 -08:00
4738f86f62 Merge pull request #18682 from calavera/replace_units_package
Replace pkg/units with docker/go-units.
Upstream-commit: b44b5bbc8ba48f50343602a21e7d44c017c1e23d
Component: engine
2015-12-16 10:48:59 -08:00
a9f65cbbd3 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>
Upstream-commit: a016ec6fd168016d94d6cfd1e2189f8c25f6de1f
Component: engine
2015-12-16 09:58:20 -08:00
0e29e152da 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>
Upstream-commit: 0609342d04e3e5fbcf17f36c5affef5073643636
Component: engine
2015-12-16 12:25:54 -05:00
d75ce7e929 cleanup hack/.vendor-helpers.sh
seccomp is already in $dockerBuildTags

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 6636aec38a6cb93cab2924dc94acd5615f4ccab8
Component: engine
2015-12-15 15:50:10 -08:00
17c0082e32 Merge pull request #18648 from jfrazelle/fix-install-script-trusty
fix install script for ubuntu trusty
Upstream-commit: b0f652fc3892ed85673c79587807a8b9cb6256a4
Component: engine
2015-12-15 12:55:01 -08:00
26cf52e1eb Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
Add support for installation on Kali Linux 2.0
Upstream-commit: 42ea7a8a93c15e77904e4324b77aa86cc0cab29d
Component: engine
2015-12-15 08:52:53 -08:00
19f8a4f8fb Merge pull request #18486 from aboch/vnd
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Upstream-commit: 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d
Component: engine
2015-12-14 13:32:01 -08:00
3d2a8bfdec fix install script for ubuntu trusty
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: bdde4b32a1bd1b2c79ac22464ffb78509046fcb4
Component: engine
2015-12-14 13:13:39 -08:00
4b93eb25be Merge pull request #18612 from mrunalp/update_runc
Update runc/libcontainer to v0.0.6
Upstream-commit: ecc3717cb17313186ee711e624b960b096a9334f
Component: engine
2015-12-14 13:05:53 -08:00
89d947a31f Merge pull request #18570 from suihkulokki/control-fix
hack/make/.build-deb/control: add missing fields
Upstream-commit: 03e2923e42446dbb830c654d0eec323a0b4ef02a
Component: engine
2015-12-14 10:41:56 -08:00