Jessie Frazelle
5e0e71bbe0
Merge pull request #13714 from flavio/add-suse-support-to-docker-installer
...
Added openSUSE and SUSE Linux Enterprise support to install.sh
2015-06-08 17:20:33 -07:00
Jessie Frazelle
a2ab067b3c
Merge pull request #13022 from Microsoft/10662-addrsrc
...
Windows: Add resources for manifest and icon
2015-06-08 15:16:10 -07:00
Jessie Frazelle
75f63499a0
Merge pull request #12992 from aidanhs/aphs-easy-debug-build
...
Allow passing DOCKER_DEBUG= to `make`
2015-06-08 15:15:49 -07:00
Tianon Gravi
4572329d4b
Fix release script to release _both_ .deb files
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-04 16:08:12 -07:00
Arnaud Porterie
b63ec6e4b1
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
2015-06-04 12:05:47 -07:00
John Howard
fd935ee63d
Windows: Build docker.exe manifested and with icon
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-06-04 11:49:10 -07:00
Sven Dowideit
318defe1de
Tiny spelling issue in the debian control file :)
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-06-04 18:16:24 +10:00
Alessandro Boch
ea180a73bc
Fix for #13720
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-06-03 23:39:27 -07:00
Jessie Frazelle
ef3e956aa2
Merge pull request #13704 from tianon/build-utc
...
Swap build-* to use UTC instead of local time
2015-06-03 22:05:09 -07:00
Arnaud Porterie
babf751e1b
Merge pull request #13715 from LK4D4/update_logrus
...
Update github.com/Sirupsen/logrus to 0.8.2
2015-06-03 14:24:37 -07:00
Jessica Frazelle
7943bce894
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 >
2015-06-03 13:28:47 -07:00
Alexander Morozov
fa020341e4
Update github.com/Sirupsen/logrus to 0.8.2
...
Fix #13708
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-03 13:22:56 -07:00
Flavio Castelli
d0c4c7c83f
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 >
2015-06-03 21:56:27 +02:00
Tianon Gravi
aa54a93f74
Swap build-* to use UTC instead of local time
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-03 09:56:46 -07:00
Arnaud Porterie
1664d6cd66
Update vendoring
...
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-02 16:41:02 -07:00
Alexander Morozov
3f26066425
Merge pull request #13591 from kvasdopil/update-go-zfs
...
Update go-zfs to last version
2015-06-02 14:05:29 -07:00
Phil Estes
63b5d5fadc
Merge pull request #13668 from calavera/bump_libnetwork
...
Bump libnetwork for 1.7 release.
2015-06-02 15:04:38 -04:00
Arnaud Porterie
274baf70bf
Merge pull request #13576 from stevvooe/verify-digests
...
Properly verify manifests and layer digests on pull
2015-06-02 11:16:23 -07:00
David Calavera
ad41efd9a2
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-02 11:00:54 -07:00
Alexey Guskov
ea5ce27564
update go-zfs to last version
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-06-02 10:37:38 +03:00
Phil Estes
d37aad170f
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
2015-06-01 12:29:45 -04:00
Jessie Frazelle
0ea14e5c6d
Merge pull request #13603 from tianon/consistent-dest
...
Make "DEST" a make.sh construct instead of ad-hoc
2015-05-30 16:42:10 -07:00
Aidan Hobson Sayers
a121ac858e
Restore DEBUG as DOCKER_DEBUG (removed in #10665 ), add as make variable
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2015-05-30 19:37:36 +01:00
Tianon Gravi
ac3388367b
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 >
2015-05-30 11:16:43 -07:00
Stephen J Day
06612cc0fe
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 >
2015-05-29 15:20:28 -07:00
Tianon Gravi
98180b8954
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 >
2015-05-29 12:55:58 -07:00
Alexander Morozov
6d8e517bce
Merge pull request #13482 from boucher/criu-libcontainer-update
...
Update vendored libcontainer
2015-05-29 10:28:58 -07:00
Jessica Frazelle
b372f9f224
fix experimental version and release script
...
add api version experimental
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-29 10:00:22 -07:00
David Calavera
37cc42ee0e
Merge pull request #13416 from Microsoft/10662-fixintegrationtests
...
Windows: Pass temp environment through
2015-05-28 11:22:37 -07:00
Jessica Frazelle
9f619282db
fix release script
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-27 20:57:46 -07:00
Arnaud Porterie
c2e8f07a05
Merge pull request #13518 from mrjana/clone
...
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
2015-05-27 17:42:10 -07:00
Jana Radhakrishnan
d429465b37
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-28 00:04:01 +00:00
Tianon Gravi
c9d3681a5d
Merge pull request #13477 from kvasdopil/freebsd-build
...
Make hack/make.sh work on FreeBSD
2015-05-27 17:42:49 -06:00
Alexey Guskov
f228fb09ac
script cleaned up
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-05-27 10:21:09 +03:00
boucher
4509f91b26
Update vendored libcontainer to v2.1
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com > (github: boucher)
2015-05-26 12:47:57 -07:00
Sebastiaan van Stijn
aee9ac302d
Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
...
add unshare apparmor profile test
2015-05-26 17:32:45 +02:00
Alexey Guskov
9e00e34092
Make hack/make.sh work on FreeBSD
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-05-26 15:59:36 +03:00
Madhu Venugopal
a3d22c764c
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
...
This version brings in upto-date important bug-fixes from libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-05-23 18:42:34 -07:00
John Howard
fba44a7ccf
Windows: Pass temp environment through
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-22 15:14:22 -07:00
Arnaud Porterie
78578125ce
Add suffix to experimental builds version
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-21 16:27:42 -07:00
Jessica Frazelle
6f75dd85c5
add unshare apparmor profile test
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-20 14:06:00 -07:00
Jessie Frazelle
19790c46dc
Merge pull request #13338 from icecrime/13023_experimental_env_var
...
Add DOCKER_EXPERIMENTAL environment variable
2015-05-20 13:04:28 -07:00
Arnaud Porterie
ca6722f1c5
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 >
2015-05-20 12:21:17 -07:00
Jana Radhakrishnan
afd901e408
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 >
2015-05-20 17:51:20 +00:00
Jana Radhakrishnan
272f8cd4bc
Vendoring in libnetwork, netns, netlink
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-19 22:40:18 +00:00
Tianon Gravi
0c375a779a
Merge pull request #13244 from hqhq/hq_update_vendor_pty
...
kr/pty: vendor upstream 5cf931ef8f
2015-05-18 11:46:43 -07:00
John Howard
0bdeef94c7
Make which cross binary fails clearer
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-15 09:25:13 -07:00
Qiang Huang
478d86a5f5
kr/pty: vendor upstream 5cf931ef8f
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-15 15:22:16 +08:00
Michael Crosby
87c35d0e0a
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-13 13:55:26 -07:00
Tianon Gravi
c2d6187811
Fix mangled hack/vendor.sh rebase
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-13 12:52:59 -06:00