a7cacbeb1d
Merge pull request #10957 from tianon/cleanup-autogen
...
Cleanup "autogen/" if we have successful build
2015-02-24 13:25:46 -08:00
e63a693c6d
add tools doc
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-02-24 11:05:05 -08:00
44adbf23b5
Cleanup "autogen/" if we have successful build
...
This way, we only leave around autogenerated files if the build fails (which is reasonable IMO, since that's when you'd need them for debugging the build failure).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-23 14:12:44 -07:00
83bf0ac96d
Merge pull request #10954 from icecrime/update_release_checklist
...
Update RELEASE-CHECKLIST.md
2015-02-23 12:20:04 -08:00
3562997296
Merge pull request #10951 from tianon/fix-dynbinary
...
Fix dynbinary with new autogen code
2015-02-23 12:08:17 -08:00
d1b515dcc5
Update RELEASE-CHECKLIST.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-23 11:34:22 -08:00
a936ea88da
Fix dynbinary with new autogen code
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-23 11:19:51 -07:00
e82cf741e3
Merge pull request #10698 from crosbymichael/issue-triage
...
Add issue triage document
2015-02-23 10:18:04 -08:00
828e76a5aa
Add issue triage document
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-20 17:19:08 -08:00
f2d2862459
Merge pull request #10833 from fabianorosas/10832-fix-test-unit-without-parallel
...
Fix test-unit run without parallel
2015-02-20 12:12:46 -08:00
ab6ae7215e
Fix export of BUILDFLAGS in test-unit. Closes #10832
...
Signed-off-by: Fabiano Rosas <farosas@br.ibm.com>
2015-02-20 16:25:10 -02:00
b32564798d
Merge pull request #10665 from brahmaroutu/autogen_removeXflag
...
Removing -X flag option and autogenerating code to create Dockerversion....
2015-02-20 09:53:07 -08:00
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
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
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
d562f94d47
Merge pull request #10797 from tianon/strict-test-environment
2015-02-19 16:14:05 -05:00
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
b7a1776878
minor grammar suggestion
...
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
2015-02-18 16:26:24 +00:00
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
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
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
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
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
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
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
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
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
87fd6375f1
Merge pull request #9943 from gdi2290/update-authors
...
Update AUTHORS file and .mailmap
2015-01-30 09:59:31 -08:00
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
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
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
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
acb8e08296
Merge pull request #10362 from LK4D4/update_libcontainer
...
Update libcontainer to 2d3b5af7486f1a4e80a5ed91859d309b4eebf80c
2015-01-26 17:18:00 -08:00
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
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
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
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
b2fe1b3dd9
Merge pull request #10155 from tianon/netgo-take-three
...
Let's try fixing "netgo" again
2015-01-20 09:45:42 -08:00
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
6b04d9342c
Update to libcontainer eb74393a3d2daeafbef4f5f27c0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-19 10:37:31 -08:00
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
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
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
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
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
9f2c486144
Merge pull request #10055 from icecrime/upgrade_libcontainer
...
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
2015-01-12 20:44:25 -08:00
71b03d8aeb
Fix tgz for Windows binaries
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-12 19:56:53 -07:00
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
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
115d8bac60
Update libcontainer to 6460fd79667466d2d9ec03f77f3
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-12 10:38:15 -08:00
Michael Crosby
Jessica Frazelle
Tianon Gravi
Jessie Frazelle
Arnaud Porterie
Michael Crosby
Fabiano Rosas
Srini Brahmaroutu
Alexander Morozov
Steve Francia
Jonathan Dowland
grossws
Ahmet Alp Balkan
unclejack
Alexander Morozov
Tibor Vass
Solomon Hykes
gdi2290