332ce60368
Merge pull request #10362 from LK4D4/update_libcontainer
...
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
Upstream-commit: acb8e08296b2570d109af3fdb447f470fdb5f665
Component: engine
2015-01-26 17:18:00 -08:00
c036119857
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
...
This revision is from docker_1.5 branch, because we don't want to
introduce user namespace in docker 1.5, but fix for --pid=host is
needed.
Fixes #10303
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: fd2d45d7d465fe02f159f21389b92164dbb433d3
Component: engine
2015-01-26 14:00:44 -08:00
83a3f5c28f
Update project/make.sh to use execdriver buildtag if passed.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 547c95957679672c3ed2e97c7a2950d3c0a03321
Component: engine
2015-01-23 16:18:39 -08:00
243df800ea
Merge pull request #10155 from tianon/netgo-take-three
...
Let's try fixing "netgo" again
Upstream-commit: b2fe1b3dd952daaadccf9951c269af84030e8873
Component: engine
2015-01-20 09:45:42 -08:00
1e4478b6cf
Let's try fixing "netgo" again
...
Since "go test" doesn't seem to support "-installsuffix" as quite the same perfect solution that "go build" is happy to let it be, let's just switch those crappy old "integration/" tests to use our separate static dockerinit binary so we don't have to worry about compiling the entire test harness statically. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 232d59baeb13778abc242a602ca434d83e1eb6e8
Component: engine
2015-01-19 12:48:25 -07:00
6a9f109b4d
Update to libcontainer eb74393a3d2daeafbef4f5f27c0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 6b04d9342c3d76f5979850f93a4afd41afa33227
Component: engine
2015-01-19 10:37:31 -08:00
fcb3e5c2df
Revert "Add proper "netgo" compiling, thanks to rsc ♥"
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jfrazelle@users.noreply.github.com > (github: jfrazelle)
Upstream-commit: e7cfb1c28b2a52f34c8e48ede2e24645991d1104
Component: engine
2015-01-14 09:55:35 -08:00
c990187923
Merge pull request #10086 from tianon/properly-fix-daemon-kill-on-failure
...
Properly fix "daemon kill" on test failure
Upstream-commit: 355415d823ab2738d7531676a2e6b144aa5d7452
Component: engine
2015-01-14 09:13:32 -08:00
162b61e657
Add proper "netgo" compiling, thanks to rsc ♥
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b5aba426d4bb903825ec4b3b4912f521daac4c2a
Component: engine
2015-01-13 21:35:21 -07:00
a9c40eeb27
Properly fix "daemon kill" on test failure
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: c18fdc37042dc7fb041475a524fe7abb0bd7afdc
Component: engine
2015-01-13 21:12:07 -07:00
37a68ceed5
Merge pull request #10055 from icecrime/upgrade_libcontainer
...
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
Upstream-commit: 9f2c48614497dee2448b65c81aa6d44953484372
Component: engine
2015-01-12 20:44:25 -08:00
9e47357d55
Fix tgz for Windows binaries
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 71b03d8aeb76b50ca05116c04ad724f380ef08f3
Component: engine
2015-01-12 19:56:53 -07:00
f0e21e0f5c
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
...
Correct exit code when dying on a signal (fixes #9979 ).
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 009041cdfd815c0ab49493f9f5757b171ee8c987
Component: engine
2015-01-12 18:12:59 -08:00
66d4635c4c
Merge pull request #10014 from tianon/fix-msys
...
Fix a few minor issues with building/running inside msysGit
Upstream-commit: 862a124db4a740b7059bf121672fcdb850513c97
Component: engine
2015-01-12 11:44:43 -08:00
c9c0b0be61
Update libcontainer to 6460fd79667466d2d9ec03f77f3
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 115d8bac6017cc5703fe34e679f1a30a4759a9ff
Component: engine
2015-01-12 10:38:15 -08:00
c24f558440
Fix a few minor issues with building/running inside msysGit
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: d43f0b9fc5ec3eae816466ec0307682c13945b31
Component: engine
2015-01-09 17:28:40 -07:00
5fb2c19adf
Merge pull request #9947 from jfrazelle/lxc-version
...
Install lxc from source.
Upstream-commit: 645a752f17c0bf66942357dc3c54ce0475c795e6
Component: engine
2015-01-08 17:37:52 -08:00
8404235dd8
Merge pull request #9648 from estesp/9202-update-resolvconf
...
Update container resolv.conf when host network changes /etc/resolv.conf
Upstream-commit: 92af1f014520b4f75a6220478b01ed6a02ca5bfb
Component: engine
2015-01-08 14:06:55 -08:00
bfb2a1f176
Update the LXC version to 1.0.7 in PACKAGERS.md
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 17373ca54b9caf2bc24d8a69c6b9639d167cb0cb
Component: engine
2015-01-08 11:37:53 -08:00
dd96c3c9fc
Update libcontainer to be02944484da197166020d6b3f0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 16dbd84f6386519dbbcefeb81cdfa708bca8cfa8
Component: engine
2015-01-08 10:29:24 -08:00
88e8bbba28
Merge pull request #9883 from tianon/irc-administration
...
Add initial new IRC administration cheat sheet of sorts
Upstream-commit: fa8b0769f6daf614e599dc43c6c02ddccac18709
Component: engine
2015-01-06 10:29:49 -08:00
2e0e2c1f43
Merge pull request #9830 from pnasrat/release-include-announce-list
...
Update release checklist to include announce mail.
Upstream-commit: 61f873792bf9f572d20be0ad8f54e88e1fb8f98e
Component: engine
2015-01-05 16:46:28 -08:00
2b984cd633
Add initial new IRC administration cheat sheet of sorts
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 0c21905a3d7cdae98ebad3155e4a1b3fe98f29a7
Component: engine
2015-01-02 23:42:45 -07:00
4d06ba471c
Add docs Cloudfront cache invalidation
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: cfaffd1ad26cf64330b87d0f99a883215b4c5a3e
Component: engine
2014-12-30 12:58:56 +10:00
70d58a0c84
Fix tabs in project/make.sh
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: d27248007f9f4034d1a630e0ac3826af3c3357ec
Component: engine
2014-12-29 11:02:12 -08:00
31dfa4a6e0
Update release checklist to include announce mail.
...
Releases should be announced on the announce list as well as -dev.
Signed-off-by: Paul Nasrat <pnasrat@gmail.com >
Upstream-commit: a1add90d89bacd0f6a7814aa72298af576107dfc
Component: engine
2014-12-27 10:59:16 -05:00
f89df3eb6f
Update libcontainer to 0f397d4e145fb4053792d42b3424dd2143fb23ad
...
This fixes wrong behavior of mutating methods of Namespaces object
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: c98ae1f88fccd89eb2184cd2b780f9827ad5ad41
Component: engine
2014-12-26 21:03:48 -08:00
052111f7e0
Fix indentation
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 6c7204393be3cd66c0bc0779d304323e8f8ac6c3
Component: engine
2014-12-23 22:01:04 -08:00
2a5b064872
Merge pull request #9795 from LK4D4/update_libcontainer
...
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
Upstream-commit: 305c898cd7fa8e7152f3f01cfdc2f5c14b4d35f0
Component: engine
2014-12-23 15:41:26 -08:00
33fd7533fb
Add github.com/go-fsnotify/fsnotify
...
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com >
Upstream-commit: edbf1ed68085171649dd0118e2f6755e7037894c
Component: engine
2014-12-23 18:17:39 -05:00
c77458bef6
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
...
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 50905a6d6ce2fdd1ab0c33ec0b7a26895e0cbeea
Component: engine
2014-12-23 12:10:03 -08:00
203c93b72e
Merge pull request #9756 from tianon/clarify-btrfs-version-dep
...
Clarify preferred btrfs-progs dependency and fix some minor inconsistencies
Upstream-commit: 084bf8a8640f92f439d1064c4596987ce29d4adb
Component: engine
2014-12-23 09:25:55 -08:00
e61e114873
Enable test-integration-cli for Windows platform
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f3ed42286e7df3a35ca41a4d19fab2a53a08b382
Component: engine
2014-12-20 16:40:40 -08:00
2acb3380fb
Clarify preferred btrfs-progs dependency and fix some minor inconsistencies
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 585202650cdf0307fcc77ba3c165c5dc8338432c
Component: engine
2014-12-19 15:36:22 -07:00
a2d81fbbe1
Merge pull request #9741 from tianon/test-docker-py
...
Add docker-py integration tests aginst the docker daemon
Upstream-commit: 0874f9ab77a7957633cd835241a76ee4406196d8
Component: engine
2014-12-19 11:57:35 -08:00
241c2f0465
Tweak test-docker-py feature
...
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 100267de81985bbf3b976bfde850def89487dc11
Component: engine
2014-12-19 10:47:01 -07:00
625be9e469
Merge pull request #8827 from jlhawn/build_implied_from_scratch
...
Make `FROM scratch` a special cased 'no-base' spec
Upstream-commit: 610842f906a942e9784bc16c201860dc89ba19ba
Component: engine
2014-12-18 18:21:16 -05:00
98bb6eba72
Make FROM scratch a special cased 'no-base' spec
...
There has been a lot of discussion (issues 4242 and 5262) about making
`FROM scratch` either a special case or making `FROM` optional, implying
starting from an empty file system.
This patch makes the build command `FROM scratch` special cased from now on
and if used does not pull/set the the initial layer of the build to the ancient
image ID (511136ea..) but instead marks the build as having no base image. The
next command in the dockerfile will create an image with a parent image ID of "".
This means every image ever can now use one fewer layer!
This also makes the image name `scratch` a reserved name by the TagStore. You
will not be able to tag an image with this name from now on. If any users
currently have an image tagged as `scratch`, they will still be able to use that
image, but will not be able to tag a new image with that name.
Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.
Fixes #4242
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 8936789919c5c8004f346f44a3452d1521818b60
Component: engine
2014-12-18 14:03:38 -08:00
f9482108f5
Merge pull request #9688 from dqminh/fix-make-tgz
...
make.sh tgz should handle windows binary
Upstream-commit: 1531bf48aa87b4a8336ab735ef025e83f09acac1
Component: engine
2014-12-18 13:16:32 -08:00
da3465e509
Add docker-py integration tests aginst the docker daemon
...
This clones and run the integration tests for docker-py master as part
of the integration tests created on master. docker-py hits the api
directly and should be a good way to identify regressions in the api.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5d6eca6642c5749099513f1f66bb44e004aa0938
Component: engine
2014-12-17 13:48:45 -08:00
401a4f9dcd
kr/pty: vendor upstream 05017fcccf
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 2524c0c5555f9127b4cd3d326430617f72979bab
Component: engine
2014-12-17 23:23:24 +02:00
148e64f5bf
add binary extension to docker binary in tgz
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: ed7aa47dea9553a89e39c16397752ef0e791aab3
Component: engine
2014-12-16 22:55:29 -05:00
752a46a922
Give maintainers the power to add contributor's DCO to a commit message, or to use their own if its a trvial change
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 56e3f49d1900f86b429a5a69839cc4f95af4dedc
Component: engine
2014-12-17 10:02:36 +10:00
3cceb0c88b
Remove small patch exception checking in hack/make/validate-dco
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 3d8f40b35b7f035bbcd7b7f99064838b24afa1f6
Component: engine
2014-12-17 10:02:36 +10:00
5b0faf336a
Merge pull request #8845 from vbatts/vbatts-issue_template
...
CONTRIBUTING: provide a template for new issues
Upstream-commit: c6a70bc78a504076c5fdc99e565973a04dab31d5
Component: engine
2014-12-16 10:41:43 -08:00
864f4f18b5
make.sh tgz should handle windows binary
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Upstream-commit: 17f8e3dee2d0df54b848cbb13af1986abe07db9f
Component: engine
2014-12-16 05:05:18 -05:00
3e6d4351a9
Updates to release checklist.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 473a443d84084e0393be2a1606d3fa49a26f4dbd
Component: engine
2014-12-11 18:47:47 -08:00
7f73c7a751
Update libcontainer to 53eca435e63db58b06cf796d3a9
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 269b37503e00f86b9215bc6fe27c502cf4d90072
Component: engine
2014-12-03 14:53:11 -08:00
9576e39bda
Merge branch 'master' of github.com:docker/docker into debug
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 61586414ca227f7c61395ccf9605f5ceece54399
Component: engine
2014-11-25 14:09:19 -05:00
f702226e49
Merge pull request #9225 from icecrime/win_make_binary
...
Adapt project/make.sh for Windows builds
Upstream-commit: ce8ebaf0e013fd4a7f6e04b36d0a2c57a19aeef9
Component: engine
2014-11-21 08:37:19 -08:00
Jessie Frazelle
Alexander Morozov
Jessica Frazelle
Alexander Morozov
Tianon Gravi
Michael Crosby
Michael Crosby
Arnaud Porterie
Sven Dowideit
Paul Nasrat
Tibor Vass
Josh Hawn
unclejack
Daniel, Dao Quang Minh
Dan Walsh