d46ebeb4ca
Merge pull request #13714 from flavio/add-suse-support-to-docker-installer
...
Added openSUSE and SUSE Linux Enterprise support to install.sh
Upstream-commit: 5e0e71bbe0cdb2dd23abee130b6ca7887c02731a
Component: engine
2015-06-08 17:20:33 -07:00
67f2667620
Merge pull request #13022 from Microsoft/10662-addrsrc
...
Windows: Add resources for manifest and icon
Upstream-commit: a2ab067b3c56f6b296150531c94a05b357fc0d70
Component: engine
2015-06-08 15:16:10 -07:00
2345f52566
Merge pull request #12992 from aidanhs/aphs-easy-debug-build
...
Allow passing DOCKER_DEBUG= to `make`
Upstream-commit: 75f63499a05ecd6511b468b666973ed9d38037ae
Component: engine
2015-06-08 15:15:49 -07:00
605f84f177
Fix release script to release _both_ .deb files
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 4572329d4b1d7b4f9cb638961a299f79443506bb
Component: engine
2015-06-04 16:08:12 -07:00
de132e9aef
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
Upstream-commit: b63ec6e4b1f6f5c77a6a74a52fcea9564538c575
Component: engine
2015-06-04 12:05:47 -07:00
b199d8e0f8
Windows: Build docker.exe manifested and with icon
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: fd935ee63db31e73b5ee5594644e04b959ead374
Component: engine
2015-06-04 11:49:10 -07:00
e4dcd8eb99
Tiny spelling issue in the debian control file :)
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 318defe1de8a9d2930d784306fd024c59e21a8c5
Component: engine
2015-06-04 18:16:24 +10:00
bda4b578b4
Fix for #13720
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ea180a73bc00491915d620c14877318cc33b2a73
Component: engine
2015-06-03 23:39:27 -07:00
4e0d41c20f
Merge pull request #13704 from tianon/build-utc
...
Swap build-* to use UTC instead of local time
Upstream-commit: ef3e956aa2c8b24fd18c7fa693b366be781fc30a
Component: engine
2015-06-03 22:05:09 -07:00
f3c5fa17d3
Merge pull request #13715 from LK4D4/update_logrus
...
Update github.com/Sirupsen/logrus to 0.8.2
Upstream-commit: babf751e1b96641ffd643b32394bf57e2de6c609
Component: engine
2015-06-03 14:24:37 -07:00
961db33814
Update urls from .com to .org.
...
I added 301 redirects from dockerproject.com to dockerproject.org but may as
well make sure everything is updated anyways.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 7943bce8942ee8c262180652951216d963fa6202
Component: engine
2015-06-03 13:28:47 -07:00
7dcd58c0ec
Update github.com/Sirupsen/logrus to 0.8.2
...
Fix #13708
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: fa020341e46cfe127b1e1124aa482651aecde359
Component: engine
2015-06-03 13:22:56 -07:00
c66e3961be
Added openSUSE and SUSE Linux Enterprise support to install.sh
...
Handle docker installation on openSUSE and SUSE Linux Enterprise
via https://get.docker.io/
Signed-off-by: Flavio Castelli <fcastelli@suse.com >
Upstream-commit: d0c4c7c83f4882dc704a8089029a012e9b1a9a36
Component: engine
2015-06-03 21:56:27 +02:00
77c62581e8
Swap build-* to use UTC instead of local time
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: aa54a93f749e2048957eb28e6045770672cb8838
Component: engine
2015-06-03 09:56:46 -07:00
5ce5df9c4d
Update vendoring
...
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 1664d6cd66c48dce5628cb67c1bdf5c7c2395d53
Component: engine
2015-06-02 16:41:02 -07:00
91a00ec5ad
Merge pull request #13591 from kvasdopil/update-go-zfs
...
Update go-zfs to last version
Upstream-commit: 3f26066425a308407054303e9e12ba1c1c743552
Component: engine
2015-06-02 14:05:29 -07:00
bd2c53758a
Merge pull request #13668 from calavera/bump_libnetwork
...
Bump libnetwork for 1.7 release.
Upstream-commit: 63b5d5fadc9fa6ac9dd93c8553030d84e7ac741f
Component: engine
2015-06-02 15:04:38 -04:00
49338919a2
Merge pull request #13576 from stevvooe/verify-digests
...
Properly verify manifests and layer digests on pull
Upstream-commit: 274baf70bf806678d12adc1e1de2c8d7774de645
Component: engine
2015-06-02 11:16:23 -07:00
0ec0ea6ec1
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ad41efd9a271998620e04602ade71a94b4b0e7e4
Component: engine
2015-06-02 11:00:54 -07:00
e864b04bef
update go-zfs to last version
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
Upstream-commit: ea5ce2756494d802f45e85224ce1a05939557d03
Component: engine
2015-06-02 10:37:38 +03:00
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
21758fe067
Restore DEBUG as DOCKER_DEBUG (removed in #10665 ), add as make variable
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: a121ac858e9b08aff0c6709337e5150b01851ffd
Component: engine
2015-05-30 19:37:36 +01: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
395ceacd61
Properly verify manifests and layer digests on pull
...
To ensure manifest integrity when pulling by digest, this changeset ensures
that not only the remote digest provided by the registry is verified but also
that the digest provided on the command line is checked, as well. If this check
fails, the pull is cancelled as with an error. Inspection also should that
while layers were being verified against their digests, the error was being
treated as tech preview image signing verification error. This, in fact, is not
a tech preview and opens up the docker daemon to man in the middle attacks that
can be avoided with the v2 registry protocol.
As a matter of cleanliness, the digest package from the distribution project
has been updated to latest version. There were some recent improvements in the
digest package.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 06612cc0fee103bf6f46429e3cd572725ef72948
Component: engine
2015-05-29 15:20:28 -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
