Commit Graph

96 Commits

Author SHA1 Message Date
ab9941d980 Merge pull request #10957 from tianon/cleanup-autogen
Cleanup "autogen/" if we have successful build
Upstream-commit: a7cacbeb1d1b85e9c12874de8dc7493b73bcc624
Component: engine
2015-02-24 13:25:46 -08:00
a9eaa4b1bb add tools doc
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: e63a693c6d4ae76cded0029bb7f60216c4b11da6
Component: engine
2015-02-24 11:05:05 -08:00
3aaa63fb85 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>
Upstream-commit: 44adbf23b5476ce26f807f956a21f27f07311a10
Component: engine
2015-02-23 14:12:44 -07:00
1c2ec47a40 Merge pull request #10954 from icecrime/update_release_checklist
Update RELEASE-CHECKLIST.md
Upstream-commit: 83bf0ac96d0ce41c4f74735a7a17a71641f7ac2f
Component: engine
2015-02-23 12:20:04 -08:00
8cccb488d5 Merge pull request #10951 from tianon/fix-dynbinary
Fix dynbinary with new autogen code
Upstream-commit: 3562997296a8ba3538390afdffcc531da62ab598
Component: engine
2015-02-23 12:08:17 -08:00
55586c529d Update RELEASE-CHECKLIST.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: d1b515dcc5a2a57610aaab54a27fbee321d355d1
Component: engine
2015-02-23 11:34:22 -08:00
6e5fd6595f Fix dynbinary with new autogen code
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a936ea88dab9751250a51b6e32ee4e7aa57d8e9d
Component: engine
2015-02-23 11:19:51 -07:00
7e8d8b3922 Merge pull request #10698 from crosbymichael/issue-triage
Add issue triage document
Upstream-commit: e82cf741e3d1cf0990836ea1112ff6e1edfa680f
Component: engine
2015-02-23 10:18:04 -08:00
dc69751f14 Add issue triage document
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 828e76a5aa8742661e8b7ee9603ce7166e90a34c
Component: engine
2015-02-20 17:19:08 -08:00
2d2518d506 Merge pull request #10833 from fabianorosas/10832-fix-test-unit-without-parallel
Fix test-unit run without parallel
Upstream-commit: f2d2862459ee501bafec2b0f33e52ae849dd7993
Component: engine
2015-02-20 12:12:46 -08:00
dd211e62ee Fix export of BUILDFLAGS in test-unit. Closes #10832
Signed-off-by: Fabiano Rosas <farosas@br.ibm.com>
Upstream-commit: ab6ae7215eab36a21c9f1c286b9e157f6b644edc
Component: engine
2015-02-20 16:25:10 -02:00
3f76171b24 Merge pull request #10665 from brahmaroutu/autogen_removeXflag
Removing -X flag option and autogenerating code to create Dockerversion....
Upstream-commit: b32564798df90222fd455a6db52a61f9b4ae2100
Component: engine
2015-02-20 09:53:07 -08:00
f634216d52 Removing -X flag option and autogenerated code to create Dockerversion.go functionality
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6871b9b16afe46e7566ac2937246b4a64be97269
Component: engine
2015-02-20 05:40:12 +00:00
7b25cb1708 Merge pull request #10872 from jfrazelle/ugh-tomlv
fix tomlv because it doesn't read from stdin
Upstream-commit: a78ce5c228b895d8c614d72354a52e324817b9fc
Component: engine
2015-02-19 20:31:34 -08:00
dd3dafec23 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)
Upstream-commit: 06685a53c16468a5fd3dfcc247a7a8dd5aaf85c1
Component: engine
2015-02-19 13:18:20 -08:00
0846fa52ae Merge pull request #10797 from tianon/strict-test-environment
Upstream-commit: d562f94d473a07c3bee84e66dd9cbf60c04ea7fe
Component: engine
2015-02-19 16:14:05 -05:00
f303319a62 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>
Upstream-commit: ed345fb18ee9d003f30884b696628b75380a426a
Component: engine
2015-02-18 23:30:43 -07:00
dc2c1ecb5d minor grammar suggestion
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
Upstream-commit: b7a1776878d4851019c65edee1df10fda530dc9a
Component: engine
2015-02-18 16:26:24 +00:00
238e12f3fa Merge pull request #10764 from grossws/patch-1
Cleanup: changed ./hack to ./project in README.md
Upstream-commit: 2243e32cbbf1c9809c262a7376d34ca43a7a36dc
Component: engine
2015-02-16 13:30:02 -08:00
bebced9dfc Merge pull request #10715 from icecrime/keyserver_install_dependency
Use gpg from our server if keyserver is down
Upstream-commit: 8b010d9f10b42377bcd741dfbe00006994bd8adc
Component: engine
2015-02-13 11:29:39 -08:00
da0bb2cbb5 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>
Upstream-commit: f058e9c43c8752dedcd4d251ddf105b22d0ed1d5
Component: engine
2015-02-13 09:13:29 -08:00
236e9294ed [trivial] changed ./hack to ./project in README.md
Signed-off-by: Konstantin Gribov <grossws@gmail.com>
Upstream-commit: 8017cb0d3b0fdb1dc9367b8445b3bc456d4666c7
Component: engine
2015-02-13 18:11:16 +03:00
8f945cfefd 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>
Upstream-commit: e1be475c5b3269246d5ecaf2b7943608941cc966
Component: engine
2015-02-12 15:02:18 -08:00
c6ec28818e Merge pull request #10660 from tianon/static_build-tag
Update project/make/dynbinary to unset the static_build tag
Upstream-commit: 4c1da911a90949e459a7ed6058b28c619daec40e
Component: engine
2015-02-09 13:02:57 -08:00
75b700c443 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>
Upstream-commit: 10a28da8fd5e4e7b29864e98965eed5f2fbd6b7c
Component: engine
2015-02-09 09:30:09 -07:00
70eb89beb0 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>
Upstream-commit: 196a7216a327dc4eb5de37faf80f2e89e13242c7
Component: engine
2015-02-03 17:55:14 +02:00
255fb9b1d6 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)
Upstream-commit: d245a8a706558c4a66498cb8d1a1d8fe38dd67ee
Component: engine
2015-01-30 15:22:11 -08:00
4a8b434df2 Merge pull request #9943 from gdi2290/update-authors
Update AUTHORS file and .mailmap
Upstream-commit: 87fd6375f1ad6fc5c0bcea2f39c6a16d3f91d5da
Component: engine
2015-01-30 09:59:31 -08:00
44e00a8ff5 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>
Upstream-commit: 0fab79f20343db9d95da191cf473651c3c8f5f42
Component: engine
2015-01-28 14:26:40 -07:00
90f3a4705d Merge pull request #10398 from LK4D4/export_daemon_vars
Export DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in integration-cli
Upstream-commit: 13b646157099ccf7566afdefd58b98cd1f52ab99
Component: engine
2015-01-28 09:44:39 -08:00
373fc40d21 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>
Upstream-commit: 667dc58c3929112a2b8b8bc67ae54a394169c6df
Component: engine
2015-01-27 16:40:11 -08:00
c589d39732 Merge pull request #10230 from tianon/emptyfs
Update emptyfs support to work properly if scratch is already an image
Upstream-commit: bb4025c4e206cf46de3ba3267efb3df96db45b91
Component: engine
2015-01-27 15:01:42 -05:00
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
a12f665228 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>
Upstream-commit: 77f840fb8bc679b8d0c3eb4ce7f443f904b7f9ac
Component: engine
2015-01-25 20:00:59 +00: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
c428ea6726 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>
Upstream-commit: 51b5dc185b12c3447f1b69a705f7828242d10a2e
Component: engine
2015-01-20 16:26:04 -07: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
b7923cb061 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>
Upstream-commit: 6df0fdf91b426a4c3ec5fb4f53381cde4ee249f2
Component: engine
2015-01-15 19:56:41 -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