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

234 commits

Author SHA1 Message Date
Srini Brahmaroutu
6871b9b16a Removing -X flag option and autogenerated code to create Dockerversion.go functionality 
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-02-20 05:40:12 +00:00
Alexander Morozov
a78ce5c228 Merge pull request #10872 from jfrazelle/ugh-tomlv 
fix tomlv because it doesn't read from stdin
 2015-02-19 20:31:34 -08:00
Jessica Frazelle
06685a53c1 fix tomlv because it doesn't read from stdin 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-02-19 13:18:20 -08:00
Steve Francia
d562f94d47 Merge pull request #10797 from tianon/strict-test-environment 2015-02-19 16:14:05 -05:00
Tianon Gravi
ed345fb18e Run tests in stricter environment 
Use `env -i` to very explicitly control exactly which environment variables leak into our tests.  This enforces a clean separation of "build environment knobs" versus "test suite knobs".

This also includes a minor tweak to how we handle starting our integration daemon, especially to catch failure to start sooner than failing tests.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-02-18 23:30:43 -07:00
Jonathan Dowland
b7a1776878 minor grammar suggestion 
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
 2015-02-18 16:26:24 +00:00
Jessie Frazelle
2243e32cbb Merge pull request #10764 from grossws/patch-1 
Cleanup: changed ./hack to ./project in README.md
 2015-02-16 13:30:02 -08:00
Jessie Frazelle
8b010d9f10 Merge pull request #10715 from icecrime/keyserver_install_dependency 
Use gpg from our server if keyserver is down
 2015-02-13 11:29:39 -08:00
Arnaud Porterie
f058e9c43c Use gpg keyserver pool 
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-02-13 09:13:29 -08:00
grossws
8017cb0d3b [trivial] changed ./hack to ./project in README.md 
Signed-off-by: Konstantin Gribov <grossws@gmail.com>
 2015-02-13 18:11:16 +03:00
Ahmet Alp Balkan
e1be475c5b Change emptyfs path in integration-cli tests 
This fixes the build break in Jenkins Windows CI tests and
fixes TestInspectImage for Windows CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-02-12 15:02:18 -08:00
Jessie Frazelle
4c1da911a9 Merge pull request #10660 from tianon/static_build-tag 
Update project/make/dynbinary to unset the static_build tag
 2015-02-09 13:02:57 -08:00
Tianon Gravi
10a28da8fd Update project/make/dynbinary to unset the static_build tag 
This allows us to use build tags in the code directly to include/exclude code based on our binary's "staticness".

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-02-09 09:30:09 -07:00
unclejack
196a7216a3 project/install.sh: install ca-certificates 
This ensures that ca-certificates are installed and that they get
updated in case they were already installed.

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-02-03 17:55:14 +02:00
Jessica Frazelle
d245a8a706 Validate toml 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
 2015-01-30 15:22:11 -08:00
Michael Crosby
87fd6375f1 Merge pull request #9943 from gdi2290/update-authors 
Update AUTHORS file and .mailmap
 2015-01-30 09:59:31 -08:00
Tianon Gravi
0fab79f203 Update .deb version numbers to be more sane 
Example output:
```console
root@906b21a861fb:/go/src/github.com/docker/docker# ./hack/make.sh binary ubuntu
bundles/1.4.1-dev already exists. Removing.

---> Making bundle: binary (in bundles/1.4.1-dev/binary)
Created binary: /go/src/github.com/docker/docker/bundles/1.4.1-dev/binary/docker-1.4.1-dev

---> Making bundle: ubuntu (in bundles/1.4.1-dev/ubuntu)
Created package {:path=>"lxc-docker-1.4.1-dev_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}
Created package {:path=>"lxc-docker_1.4.1~dev~git20150128.182847.0.17e840a_amd64.deb"}

```

As noted in a comment in the code here, this sums up the reasoning for this change: (which is how APT and reprepro compare versions)
```console
$ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
true
$ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
true
```

ie, `1.5.0` > `1.5.0~rc1` > `1.5.0~git20150128.112847.17e840a` > `1.5.0~dev~git20150128.112847.17e840a`

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-28 14:26:40 -07:00
Jessie Frazelle
13b6461570 Merge pull request #10398 from LK4D4/export_daemon_vars 
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
 2015-01-28 09:44:39 -08:00
Alexander Morozov
667dc58c39 Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli 
This needed for our "small" testing daemon using same config as "big"
testing daemon.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-01-27 16:40:11 -08:00
Tibor Vass
bb4025c4e2 Merge pull request #10230 from tianon/emptyfs 
Update emptyfs support to work properly if scratch is already an image
 2015-01-27 15:01:42 -05:00
Jessie Frazelle
acb8e08296 Merge pull request #10362 from LK4D4/update_libcontainer 
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
 2015-01-26 17:18:00 -08:00
Alexander Morozov
fd2d45d7d4 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>
 2015-01-26 14:00:44 -08:00
Solomon Hykes
77f840fb8b Proposal for an improved project structure. 
Note: this deprecates the fine-grained, high-overlap cascading MAINTAINERS files,
and replaces them with a single top-level file, using a new structure:

* More coarse grained subsystems with dedicated teams of maintainers
* Core maintainers with a better-defined role and a wider scope (if it's
not in a subsystem, it's up to the core maintainers to figure it out)
* Architects
* Operators

This is work in progress, the goal is to start a conversation

Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-01-25 20:00:59 +00:00
Jessica Frazelle
547c959576 Update project/make.sh to use execdriver buildtag if passed. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-23 16:18:39 -08:00
Tianon Gravi
51b5dc185b Update emptyfs support to work properly if scratch is already an image 
Also, this decouples the emptyfs script from the busybox one -- they're now functionally separate thanks to the scratch no-op change. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-01-20 16:26:04 -07:00
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