Commit Graph

629 Commits

Author SHA1 Message Date
c1e042a6e9 Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
2015-06-01 12:29:45 -04:00
d3e3277a8e Merge pull request #13603 from tianon/consistent-dest
Make "DEST" a make.sh construct instead of ad-hoc
Upstream-commit: 0ea14e5c6d5cd731715b53f6971faef45cd06cd3
Component: engine
2015-05-30 16:42:10 -07:00
c50b83a729 Make "DEST" a make.sh construct instead of ad-hoc
Using "DEST" for our build artifacts inside individual bundlescripts was already well-established convention, but this officializes it by having `make.sh` itself set the variable and create the directory, also handling CYGWIN oddities in a single central place (instead of letting them spread outward from `hack/make/binary` like was definitely on their roadmap, whether they knew it or not; sneaky oddities).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: ac3388367b6493987cef8017774fa4cdb5d2098f
Component: engine
2015-05-30 11:16:43 -07:00
efadb1b4ee Finally add precise/12.04 as a build-deb target
Ubuntu Precise has a number of warts that made it non-trivial to add initially, but I've managed to work through some of them and come up with a working build.  Two important parts to note are that it has neither the `btrfs` nor the `devicemapper` graphdriver backends since `btrfs-tools` and `libdevmapper-dev` in the precise repositories are too ancient for them to even compile.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 98180b89543396c07c1f1ea420554fbcce31c513
Component: engine
2015-05-29 12:55:58 -07:00
d6425cf5ab Merge pull request #13482 from boucher/criu-libcontainer-update
Update vendored libcontainer
Upstream-commit: 6d8e517bce90866abcf311cd5cc079ad8cce2a86
Component: engine
2015-05-29 10:28:58 -07:00
a4e456d439 fix experimental version and release script
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: b372f9f224d2dcc2a7beca55751782060dc9b12f
Component: engine
2015-05-29 10:00:22 -07:00
da2cc90fcd Merge pull request #13416 from Microsoft/10662-fixintegrationtests
Windows: Pass temp environment through
Upstream-commit: 37cc42ee0e742a14047f32ef27c9b8b2371e1fb8
Component: engine
2015-05-28 11:22:37 -07:00
a3f2ea4982 fix release script
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 9f619282dba2f42ada6f7e92705a1c8979193214
Component: engine
2015-05-27 20:57:46 -07:00
32f8a6c6ff Merge pull request #13518 from mrjana/clone
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
Upstream-commit: c2e8f07a052505c07c4fe38da8e2d5139ffa00a4
Component: engine
2015-05-27 17:42:10 -07:00
9218287317 Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d429465b37b29f72109e373379580f020d3ff9ee
Component: engine
2015-05-28 00:04:01 +00:00
01b03d6fa4 Merge pull request #13477 from kvasdopil/freebsd-build
Make hack/make.sh work on FreeBSD
Upstream-commit: c9d3681a5d0cd2d275299146855283fa89c6cdd9
Component: engine
2015-05-27 17:42:49 -06:00
af2789e761 script cleaned up
Signed-off-by: Alexey Guskov <lexag@mail.ru>
Upstream-commit: f228fb09acffde575c704d501739ad547baf4e24
Component: engine
2015-05-27 10:21:09 +03:00
9181b59d85 Update vendored libcontainer to v2.1
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
Upstream-commit: 4509f91b26869500dd0d7ea6858e03b1b00eef5d
Component: engine
2015-05-26 12:47:57 -07:00
828fa4725f Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
add unshare apparmor profile test
Upstream-commit: aee9ac302d06ebcc56713142245aa19584c8b99f
Component: engine
2015-05-26 17:32:45 +02:00
d913f69b1f Make hack/make.sh work on FreeBSD
Signed-off-by: Alexey Guskov <lexag@mail.ru>
Upstream-commit: 9e00e34092ca1f2f2e7919430f5756f94e484cdb
Component: engine
2015-05-26 15:59:36 +03:00
2f63354a90 Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
This version brings in upto-date important bug-fixes from libnetwork

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: a3d22c764cfc3e175cdfb992f3b2314f23540236
Component: engine
2015-05-23 18:42:34 -07:00
9cf93fa55c Windows: Pass temp environment through
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: fba44a7ccf6eb9ba588b9d1df6a3a22fd5c5dc18
Component: engine
2015-05-22 15:14:22 -07:00
b53e996e55 Add suffix to experimental builds version
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 78578125ce6c534253d8d60c242d6993c569449e
Component: engine
2015-05-21 16:27:42 -07:00
78d72e0857 add unshare apparmor profile test
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 6f75dd85c5adbced787a2e15aa7e9ccd71289749
Component: engine
2015-05-20 14:06:00 -07:00
0a8a3b1dc5 Merge pull request #13338 from icecrime/13023_experimental_env_var
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
2015-05-20 13:04:28 -07:00
045dd55a7d Add DOCKER_EXPERIMENTAL environment variable
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
2015-05-20 12:21:17 -07:00
6fda96cea6 Fix network connectivity problem for non-root users
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: afd901e408d8d4ed00707c545ae985bc637a1979
Component: engine
2015-05-20 17:51:20 +00:00
769fee3fba Vendoring in libnetwork, netns, netlink
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 272f8cd4bc537bd78e7bf02d5b06fac50afda8ff
Component: engine
2015-05-19 22:40:18 +00:00
984dd795a4 Merge pull request #13244 from hqhq/hq_update_vendor_pty
kr/pty: vendor upstream 5cf931ef8f
Upstream-commit: 0c375a779ab076c8f6a4f76071e5feab60e15714
Component: engine
2015-05-18 11:46:43 -07:00
1c502870b7 Make which cross binary fails clearer
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0bdeef94c7268e0816528423898b1daefe195d89
Component: engine
2015-05-15 09:25:13 -07:00
2d55f07e06 kr/pty: vendor upstream 5cf931ef8f
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 478d86a5f5046165c0e34612eb5983630830e93f
Component: engine
2015-05-15 15:22:16 +08:00
eaedb9b85a Update libcontainer to a37b2a4f152e2a1c9de596f54c0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 87c35d0e0af930d1c7ac03f852287348f7f9d240
Component: engine
2015-05-13 13:55:26 -07:00
1d7b0aaa0c Fix mangled hack/vendor.sh rebase
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c2d618781183817e74245325add5bddebcb810d2
Component: engine
2015-05-13 12:52:59 -06:00
605da98d23 cleanup test-integration
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: e096d56713b23e076f1adc618b5fd765d9485b45
Component: engine
2015-05-12 15:39:57 -07:00
5a91f639c0 Merge pull request #9411 from Mic92/features/zfs-rebased
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
2015-05-11 16:53:17 -07:00
aaee340d81 Update github.com/syndtr/gocapability to 66ef2aa7a23ba682594e2b6f74cf40c0692b49fb
It adds List function for listing all supported caps

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5a2d592c27e93cf7f3d01216cf6e22656330fe84
Component: engine
2015-05-08 09:22:37 -07:00
01977b40d0 integration: add variable to set storage options for testing
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: 30f3bd643d5f6706bbaa9559e781b036661f149e
Component: engine
2015-05-08 17:49:39 +02:00
e5820ed7e4 Implement Docker on ZFS
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: d5151ca8ab5d90300839c8572cb96577de4d6233
Component: engine
2015-05-08 17:48:20 +02:00
2e6e1769a6 Update "hack/vendor.sh" to be more explicit
Previously, we've taken advantage of the fact that libcontainer's `update-vendor.sh` is the same syntax as Docker's `vendor.sh` with some shell magic.  This changes that to copy libcontainer's dependencies into this file explicitly so that we can scale to more projects with varying methods of vendoring (assuming they don't use import re-writing, which screws up everyone).

We'll need to stay diligent in making sure this list matches what's in libcontainer's `update-vendor.sh` (minus the not-required codegangsta/cli dep), but that's a fair trade-off for being able to scale our dependency model better (and track new discrete dependencies more directly).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b919dee8347a47763d576136254bcbc922ef4c57
Component: engine
2015-05-07 17:43:11 -06:00
eb6a693474 Merge pull request #13032 from jfrazelle/nano-nano-nano
add nanorc to packaged builds
Upstream-commit: 6a1f862e40001b3389970b57ea38f718d4748881
Component: engine
2015-05-07 17:35:03 -06:00
159968801d Merge pull request #13065 from tianon/fix-build-deb-tilde-expansion
Fix '~' expansion in build-deb... (properly this time)
Upstream-commit: b6448f25f2fda3518d36b5a49fd67064cff2c952
Component: engine
2015-05-07 16:24:33 -07:00
72be67236b add nanorc to packaged builds
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: f66d225427d135069e1fd1e9649bc5654a0f675c
Component: engine
2015-05-07 16:10:07 -07:00
f61181dd2f Update libcontainer to 1b471834b45063b61e0aedefbb1
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 2f54c1a352e23de04a4535d0fc1bd0cad66c7c15
Component: engine
2015-05-07 14:43:39 -07:00
2ee6387cbc Merge pull request #12165 from icecrime/optional_userland_proxy
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
2015-05-07 14:01:16 -07:00
0dfa2f6043 Update "install.sh" warning to be more verbose
See https://github.com/docker/docker/issues/12395#issuecomment-99941300 for some of the context on this one.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: fc9ff248c1ccb586297419336b6ad5da640f2bd5
Component: engine
2015-05-07 14:20:40 -06:00
23e06861d0 Fix '~' expansion in build-deb... (properly this time)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 297cd347a676a79dee94509de7669919a4d9fab3
Component: engine
2015-05-07 14:02:21 -06:00
7d4cfe310d Merge pull request #12965 from tianon/libcontainer-logrus
Update libcontainer and make it the source of truth on logrus version
Upstream-commit: db26564864f5ef1f2402792ad8dd22bb62b3570c
Component: engine
2015-05-07 10:10:28 -07:00
a1ac14178e Fix build-deb
This fixes the part of #12996 that I forgot. 👼

This also fixes a minor path issue (there's no `libexec` in Debian), and fixes a minor bug with the `debVersion` parsing.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 867eed8f3586c81b32dc9f85208692e9e1c9909a
Component: engine
2015-05-06 18:10:15 -06:00
898f9341bc Merge pull request #12917 from jfrazelle/add-rpm
Add RPM for centos-7, fedora-20, fedora-21
Upstream-commit: 2281d6c266e87264d885314e2c4641ece725b161
Component: engine
2015-05-05 17:31:21 -07:00
0017c3b28a Add rpm for centos-6, centos-7, fedora-20, fedora-21
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 18beb5561140aaa950f00391a87bb332fb2b6aea
Component: engine
2015-05-05 16:05:30 -07:00
ae45d9cbea Make a docker-in-docker dynamic binary and add RPM target
This change adds a new docker-in-docker dynamic binary make target which
builds a centos container for creating the dynamically linked binary.
To use it, you first must create the static binary and then call the
dind-dynbinary target.  You can call it like:

$ hack/make.sh binary dind-dynbinary rpm

This would then package the dynamic binary into the rpm after having
created it in the centos build container.  Unfortunately with this approach
you can't create the rpms and the debs with the same command.  They have to
be created separately otherwise the wrong version (static vs. dynamic) gets
packaged.

Various RPM fixes including:
  - Adding missing RPM dependencies.
  - Add sysconfig configuration files to the RPM.
  - Add an epoch to silence the fpm warning.
  - Remove unnecessary empty package.

Signed-off-by: Patrick Devine <patrick.devine@docker.com>
Signed-off-by: Chad Metcalf <chad@docker.com>
Upstream-commit: 878dcb89f38e8eb7bb07ccd4a4e5ce622252ff30
Component: engine
2015-05-05 10:01:39 -07:00
e1c57390f1 Replace "docker-core" with "docker-engine" in "build-deb"
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 5e563d170815ce3111eb66b44cfd252c80d8f34c
Component: engine
2015-05-05 10:11:59 -06:00
afd229a538 Add DOCKER_USERLANDPROXY test variable
Add an convenient way to switch --userland-proxy on and off in
integration tests.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 44de5fecce9dd194fade1b696e9297ac5c985754
Component: engine
2015-05-04 16:07:51 -07:00
11e5be135f Merge pull request #12190 from rhvgoyal/deferred-removal
Devicemapper: Provide deferred device removal capability
Upstream-commit: 56c991781564e8cc292166d3b3e27e304c240468
Component: engine
2015-05-04 14:22:52 -07:00
fccc1b566d Update libcontainer and make it the source of truth on logrus version
To help avoid version mismatches between libcontainer and Docker, this updates libcontainer to be the source of truth for which version of logrus the project is using.  This should help avoid potential incompatibilities in the future, too. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 80a895142e7101b44ff71910bb2da994b1cc4f5f
Component: engine
2015-05-04 11:02:44 -06:00