beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32698 commits 14 branches 412 tags 338 MiB
Commit graph

209 commits

Author SHA1 Message Date
Alexander Morozov
b2fe1b3dd9 Merge pull request #10155 from tianon/netgo-take-three 
Let's try fixing "netgo" again
 2015-01-20 09:45:42 -08:00
Tianon Gravi
232d59baeb 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>
 2015-01-19 12:48:25 -07:00
Michael Crosby
6b04d9342c Update to libcontainer eb74393a3d2daeafbef4f5f27c0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-19 10:37:31 -08:00
gdi2290
6df0fdf91b Update AUTHORS file and .mailmap 
added `LC_ALL=C.UTF-8` due to osx
http://www.inmotionhosting.com/support/website/ssh/speed-up-grep-searche
s-with-lc-all

Signed-off-by: Patrick Stapleton <github@gdi2290.com>
 2015-01-15 19:56:41 -08:00
Jessie Frazelle
e7cfb1c28b Revert "Add proper "netgo" compiling, thanks to rsc ♥" 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jfrazelle@users.noreply.github.com> (github: jfrazelle)
 2015-01-14 09:55:35 -08:00
Jessie Frazelle
355415d823 Merge pull request #10086 from tianon/properly-fix-daemon-kill-on-failure 
Properly fix "daemon kill" on test failure
 2015-01-14 09:13:32 -08:00
Tianon Gravi
b5aba426d4 Add proper "netgo" compiling, thanks to rsc ♥ 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-13 21:35:21 -07:00
Tianon Gravi
c18fdc3704 Properly fix "daemon kill" on test failure 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-13 21:12:07 -07:00
Michael Crosby
9f2c486144 Merge pull request #10055 from icecrime/upgrade_libcontainer 
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
 2015-01-12 20:44:25 -08:00
Tianon Gravi
71b03d8aeb Fix tgz for Windows binaries 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-12 19:56:53 -07:00
Arnaud Porterie
009041cdfd Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4 
Correct exit code when dying on a signal (fixes #9979).

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-01-12 18:12:59 -08:00
Michael Crosby
862a124db4 Merge pull request #10014 from tianon/fix-msys 
Fix a few minor issues with building/running inside msysGit
 2015-01-12 11:44:43 -08:00
Michael Crosby
115d8bac60 Update libcontainer to 6460fd79667466d2d9ec03f77f3 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-12 10:38:15 -08:00
Tianon Gravi
d43f0b9fc5 Fix a few minor issues with building/running inside msysGit 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-09 17:28:40 -07:00
Jessie Frazelle
645a752f17 Merge pull request #9947 from jfrazelle/lxc-version 
Install lxc from source.
 2015-01-08 17:37:52 -08:00
Alexander Morozov
92af1f0145 Merge pull request #9648 from estesp/9202-update-resolvconf 
Update container resolv.conf when host network changes /etc/resolv.conf
 2015-01-08 14:06:55 -08:00
Jessica Frazelle
17373ca54b 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)
 2015-01-08 11:37:53 -08:00
Michael Crosby
16dbd84f63 Update libcontainer to be02944484da197166020d6b3f0 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-08 10:29:24 -08:00
Jessie Frazelle
fa8b0769f6 Merge pull request #9883 from tianon/irc-administration 
Add initial new IRC administration cheat sheet of sorts
 2015-01-06 10:29:49 -08:00
Michael Crosby
61f873792b Merge pull request #9830 from pnasrat/release-include-announce-list 
Update release checklist to include announce mail.
 2015-01-05 16:46:28 -08:00
Tianon Gravi
0c21905a3d Add initial new IRC administration cheat sheet of sorts 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-02 23:42:45 -07:00
Sven Dowideit
cfaffd1ad2 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>
 2014-12-30 12:58:56 +10:00
Jessica Frazelle
d27248007f Fix tabs in project/make.sh 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-29 11:02:12 -08:00
Paul Nasrat
a1add90d89 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>
 2014-12-27 10:59:16 -05:00
Alexandr Morozov
c98ae1f88f Update libcontainer to 0f397d4e145fb4053792d42b3424dd2143fb23ad 
This fixes wrong behavior of mutating methods of Namespaces object

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-12-26 21:03:48 -08:00
Arnaud Porterie
6c7204393b Fix indentation 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-23 22:01:04 -08:00
Michael Crosby
305c898cd7 Merge pull request #9795 from LK4D4/update_libcontainer 
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
 2014-12-23 15:41:26 -08:00
Tianon Gravi
edbf1ed680 Add github.com/go-fsnotify/fsnotify 
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
 2014-12-23 18:17:39 -05:00
Alexander Morozov
50905a6d6c 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>
 2014-12-23 12:10:03 -08:00
Tianon Gravi
084bf8a864 Merge pull request #9756 from tianon/clarify-btrfs-version-dep 
Clarify preferred btrfs-progs dependency and fix some minor inconsistencies
 2014-12-23 09:25:55 -08:00
Arnaud Porterie
f3ed42286e Enable test-integration-cli for Windows platform 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-12-20 16:40:40 -08:00
Tianon Gravi
585202650c Clarify preferred btrfs-progs dependency and fix some minor inconsistencies 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-19 15:36:22 -07:00
Alexander Morozov
0874f9ab77 Merge pull request #9741 from tianon/test-docker-py 
Add docker-py integration tests aginst the docker daemon
 2014-12-19 11:57:35 -08:00
Tianon Gravi
100267de81 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>
 2014-12-19 10:47:01 -07:00
Tibor Vass
610842f906 Merge pull request #8827 from jlhawn/build_implied_from_scratch 
Make `FROM scratch` a special cased 'no-base' spec
 2014-12-18 18:21:16 -05:00
Josh Hawn
8936789919 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)
 2014-12-18 14:03:38 -08:00
Tianon Gravi
1531bf48aa Merge pull request #9688 from dqminh/fix-make-tgz 
make.sh tgz should handle windows binary
 2014-12-18 13:16:32 -08:00
Michael Crosby
5d6eca6642 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>
 2014-12-17 13:48:45 -08:00
unclejack
2524c0c555 kr/pty: vendor upstream 05017fcccf 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2014-12-17 23:23:24 +02:00
Daniel, Dao Quang Minh
ed7aa47dea add binary extension to docker binary in tgz 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-12-16 22:55:29 -05:00
Sven Dowideit
56e3f49d19 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>
 2014-12-17 10:02:36 +10:00
Tianon Gravi
3d8f40b35b Remove small patch exception checking in hack/make/validate-dco 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-12-17 10:02:36 +10:00
Michael Crosby
c6a70bc78a Merge pull request #8845 from vbatts/vbatts-issue_template 
CONTRIBUTING: provide a template for new issues
 2014-12-16 10:41:43 -08:00
Daniel, Dao Quang Minh
17f8e3dee2 make.sh tgz should handle windows binary 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-12-16 05:05:18 -05:00
Jessica Frazelle
473a443d84 Updates to release checklist. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-12-11 18:47:47 -08:00
Michael Crosby
269b37503e Update libcontainer to 53eca435e63db58b06cf796d3a9 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-12-03 14:53:11 -08:00
Dan Walsh
61586414ca Merge branch 'master' of github.com:docker/docker into debug 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-11-25 14:09:19 -05:00
Arnaud Porterie
ce8ebaf0e0 Merge pull request #9225 from icecrime/win_make_binary 
Adapt project/make.sh for Windows builds
 2014-11-21 08:37:19 -08:00
Michael Crosby
f42176434a Update libcontainer to 84c1636580a356db88b079d118b 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-20 14:19:24 -08:00
Tibor Vass
998b591a71 Merge pull request #9201 from vieux/add_hostname_docker_info 
Add hostname and ID docker info
 2014-11-20 13:11:16 -05:00
Dan Walsh
bce9ed0e4c Allow developers to build docker with debuginfo included 
If you execute

DEBUG=-g hack/make.sh dynbinary

Docker will be build with the debug info making it easier to use
cgdb or lightide to debug.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-11-20 12:59:50 -05:00
Victor Vieux
6e92dfdfd8 Update libtrust version 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-11-20 17:39:54 +00:00
Arnaud Porterie
ce86d5ae68 Adapt project/make.sh for Windows builds 
Fixes:
- link -H windows is not compatible with -linkmode external
- under Cygwin go does not play well with cygdrive type paths

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-11-19 13:41:57 -08:00
Vincent Batts
ea5a2c1fd7 issue report script 
Add a script that will facilitate standard issue reports.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2014-11-19 12:32:45 -05:00
Michael Crosby
0722c9b536 Merge pull request #9187 from icecrime/update_authors_file 
Update AUTHORS file
 2014-11-18 16:31:07 -08:00
Michael Crosby
975fa5487c Update libcontainer to 28cb5f9dfd6f3352c610a4f1502 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-11-17 12:16:37 -08:00
Arnaud Porterie
ab7a6544b0 Update AUTHORS file 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2014-11-16 23:41:25 -08:00
Ahmet Alp Balkan
b7703a992e Add windows/(386,amd64) to cross platforms list 
Edited make scripts to append .exe to windows binary

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
 2014-11-14 18:20:54 -08:00
Solomon Hykes
32e61b8f5c Move 'hack' to the less confusing 'project' 
We might want to break it up into smaller pieces (eg. tools in one
place, documents in another) but let's worry about that later.

Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-11-09 21:50:28 +00:00