Commit Graph

354 Commits

Author SHA1 Message Date
add055e2b6 Merge pull request #5822 from creack/update_vendors
Update archive/tar vendored
Upstream-commit: eb61a1f73a979cc12e5ec1e6f451ec4dc4e37817
Component: engine
2014-05-16 16:31:37 -07:00
091a0d0e78 Merge pull request #5461 from SvenDowideit/getmaintainers.sh
Upstream-commit: 87fc7130a4860e1eb46469329b37bb1ce9c9c744
Component: engine
2014-05-15 17:15:40 -07:00
f5e7688aff Update archive/tar vendored
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 094926206bc98718f2eac95849e57439155d7c6c
Component: engine
2014-05-15 15:40:26 -07:00
e0f7bd3420 Merge pull request #5463 from tianon/hack-dind-cgroup
Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" for better compatibility
Upstream-commit: 29f1efc94040df21aaf6e932fc797a1113ab03cb
Component: engine
2014-05-09 13:54:52 -07:00
ab2cd6cfbd Update vendored deps that have a proper version number to use said specific versions
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 8d7ed2cae49918c9f31e9fd068b28c8e114e939b
Component: engine
2014-05-03 20:34:21 -06:00
81be77fbe1 Merge pull request #5462 from tianon/hack-dind-style
Update hack/dind to match the rest of our scripts
Upstream-commit: b3ff1c55e34d7b92843ca05bbac70e357e7ae8d0
Component: engine
2014-05-02 14:43:56 -07:00
8a4635dfd2 Merge pull request #5507 from shykes/dind-maintainer
Make Jerome Petazzoni a maintainer for dind
Upstream-commit: 4d521f479b4596ffa4719c1d15eb7b3f990fa2d1
Component: engine
2014-05-02 11:25:41 -07:00
675ce830a9 skip apparmor with dind
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: de191e86321f7d3136ff42ff75826b8107399497
Component: engine
2014-05-01 22:22:08 +00:00
bf18e83e5d Merge pull request #5464 from tianon/close-leftover-fds
Upstream-commit: e88ef454b7a8705570623e6d26f51731b8300e0f
Component: engine
2014-04-30 12:27:52 -07:00
0ff7aa326b Make Jerome Petazzoni a maintainer for dind
In the spirit of getting more contributors to maintain their
components.. I nominate @jpetazzo ot maintain dind (he's the original
author).

@jpetazzo I don't expect this to be too much load, but it's a good and
symbolic start :)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1fd919bbf41e68cd38a4794e1f8e3d585650a231
Component: engine
2014-04-30 12:20:52 -07:00
79d31745eb Add new test-unit make rule which only runs the unit tests. Renames test
bundle to test-unit.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: a39f3c9200d574c12b88fb91654f1242ec07b7b5
Component: engine
2014-04-29 23:26:27 +00:00
614fad87b9 Close extraneous file descriptors in containers
Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :)

Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d5d62ff95574a48816890d8d6e0785a79f559c3c
Component: engine
2014-04-29 16:45:28 -06:00
55792f63be Merge pull request #5477 from vmarmol/add-testdirs
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
Upstream-commit: a96cac4d7d42db757f9387ff1352ebedfc7b557e
Component: engine
2014-04-29 16:40:40 -06:00
4478918ea3 Merge pull request #5460 from tianon/no-pull-scratch
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
Upstream-commit: 2c85468753509c442a675d79de0e65476468c453
Component: engine
2014-04-29 14:37:06 -07:00
f54d99728b Add a TESTDIRS variable to the test bundle to allow for the running of a
single go directory worth of tests.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Upstream-commit: 6e05c420c9b7e4660b391643be21720d6f80e18d
Component: engine
2014-04-29 20:55:04 +00:00
0bb0e72f1c modernise the MAINTAINER process documentation to line up with what I understand it to be
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 48dbee082403a57b4dbc344e12b6724016d64b72
Component: engine
2014-04-29 15:28:04 +10:00
bbec633621 Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" for better compatibility
Fixes #5122

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 659305085f551e39143636b1cfb8351a63cbab6f
Component: engine
2014-04-28 23:17:36 -06:00
fd54ea0e5f Update hack/dind to match the rest of our scripts
No functional changes here, just coding style and maintainability.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b1fe1797f3a808f38cec3d0b9a22556646163441
Component: engine
2014-04-28 23:16:40 -06:00
cc76f7eafc Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
Creating the "docker save" tarball for "scratch" is pretty simple.  I've also extrapolated the "docker build -t busybox ." logic into a separate "hack/make/.ensure-busybox" file so that it can eventually be reused easier.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c8381d672226dd17f2e17f9cf9378f06d533911c
Component: engine
2014-04-28 22:26:25 -06:00
1e62c9c969 Remove obsolete 'bootcamp' project.
It was a nice idea to recruit more maintainers but we never found the
time to do it properly...

I am still interested in any ideas to make it easier to start
contributing!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 46492ee65a26c8b3a138f4b9f5eea0e648dc8b45
Component: engine
2014-04-28 21:25:26 -07:00
bf6a9b5906 Update some whitespace in hack/make/test-integration-cli for consistency
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e4114e6b946dfc0f433fa0f6a9de42f80656ce08
Component: engine
2014-04-28 22:22:31 -06:00
04e53d0381 Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
I tested to verify that if neither package is available (for example, on Debian Wheezy), apt still continues installing properly.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 314818e7ba4c675b63caaaabadcfd12d10c4f3a6
Component: engine
2014-04-28 17:08:03 -06:00
7d52af3e31 Merge pull request #5205 from ipbabble/manpages
Completed the manual paged in Markdown. rm old man pages.
Upstream-commit: ba11de9efaf6e493726c32cafc3010d594b8fdbd
Component: engine
2014-04-22 14:48:53 +10:00
44ed49fbeb Clean up MAINTAINERS files
* Remove out of date "vacation mode"
* Fix my email address
* Remove infrastructure maintainers to reflect reality (core maintainers
are currently maintaining their own infrastructure).

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 19e6614eeb31d6a986ef61486e15aeb09cc952b8
Component: engine
2014-04-21 18:17:13 -07:00
221acbe18c Update hack/make/ubuntu to use the new markdown-based manpages
This also removes all the old man pages, .gitignores their directory, and updates the md2man-all.sh script to be easier to read and more friendly to being called within hack/make/ubuntu.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e55ed741c24fe9e974d08f4893c79752fb279dc4
Component: engine
2014-04-21 10:42:46 -07:00
27e5f687ba Merge pull request #5232 from kzys/freebsd-graph
Fix graph and pkg/graphdb on FreeBSD
Upstream-commit: 3c50cb44d186ccaf9edc85cad0f91917516ff07c
Component: engine
2014-04-21 10:39:50 -07:00
da097b4451 SQLite is also available in FreeBSD
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 92ea101bc4a498e952ede00bff53d0123f22f41c
Component: engine
2014-04-17 07:19:30 +09:00
26f35ab8b4 Add missing "ps" requirement to PACKAGERS.md
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2e78ab91ec0c99c52e4b61fe186f0ad8048de9e8
Component: engine
2014-04-15 21:55:48 -06:00
abb1fb2274 Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7bb72fa080d13c3b90d624cb77530632c7705c56
Component: engine
2014-04-14 13:35:54 -06:00
156fab79f3 Merge pull request #4878 from kzys/freebsd-utimes
Support FreeBSD on pkg/system/utimes_*.go
Upstream-commit: f98ed28c1dd5766cb8c80f32418f13878df29e6c
Component: engine
2014-04-14 10:39:25 -07:00
103b32014b cli integ: don't fetch busybox if it exists
Don't make calls to the registry if the image exists already.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 449f92f11ed34d4475fa24e2561b02cc263722bf
Component: engine
2014-04-13 15:06:15 +03:00
3b78fa93c6 Merge pull request #5072 from tianon/hack-set-e-consistently
Update bundlescripts to use "set -e" consistently
Upstream-commit: 28e7e814795fce2a75e4767a6707a6e4d03fa8b6
Component: engine
2014-04-10 13:37:36 -06:00
98f471928f Merge pull request #5069 from tianon/hack-make-ubuntu-man
Add contrib/man to our generated deb
Upstream-commit: 7dd9c208fdb4ea3083783437843ea27c7c8a077b
Component: engine
2014-04-10 08:04:04 -07:00
d9e097fbe6 Unlike GNU find, FreeBSD's find needs a path before an expression
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 66baf56601f4fc1e8f5f2863d227283954b73a77
Component: engine
2014-04-10 07:13:41 +09:00
380ead943d Use LLVM Clang explicitly on FreeBSD
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 18bea2495d0bcc354a2538cb161081cb56e5c6f7
Component: engine
2014-04-10 07:13:41 +09:00
dce753ef81 Update bundlescripts to use "set -e" consistently
"set -e" is already inherited here from make.sh, but explicit is always better than implicit (hence the "set -e" in the first place!)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b298960aed8155e7dbedb6602cdbb42eacee83f7
Component: engine
2014-04-09 12:11:06 -06:00
71e18cf0d0 Merge pull request #5022 from tianon/make-validate
Add "make validate" for both local and CI gofmt and DCO verification
Upstream-commit: 566d49c9cafd5e64024e67d2ff1ebbcad6332cbf
Component: engine
2014-04-08 19:17:30 -06:00
61ed858da5 Merge pull request #5091 from jamtur01/fedora_install
Add Fedora installation to install.sh
Upstream-commit: c6046b40f0dfc624bb0cad78f24ed0c1174af7f1
Component: engine
2014-04-08 13:15:00 -06:00
4dd63976db Removed extra whitespace
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a2aa902ec194169431fea6784c4a7cdab25aaf24
Component: engine
2014-04-08 12:07:27 -07:00
1a88bac6fb Added Fedora installation method
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: fa5223dab5b9f5cef2a0a341ee5065fec9c6d663
Component: engine
2014-04-08 12:07:16 -07:00
a63cb994eb Merge pull request #5073 from tianon/update-release-bundles
Update RELEASE_BUNDLES to include integration tests
Upstream-commit: 2204a27df08ffaa4ef3ca9ec158527d4a34440a7
Component: engine
2014-04-08 13:05:00 -06:00
0ebf538308 Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4c3eb7db675c7f8f15ef0d55e99a6699908f930c
Component: engine
2014-04-07 23:10:40 -06:00
e72481cf86 Update RELEASE_BUNDLES to include integration tests
Previously, running just "hack/release.sh" only ran the unit tests.  This updates that to run the unit tests, then the integration tests, then build the binaries, then run the cli integration tests (so we're literally testing the binary we're about to release, which is super freaking cool IMO <3).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 886eb85dec7f4e9e193151befa7e6b4213ea67a0
Component: engine
2014-04-07 22:22:03 -06:00
638db33ace Add contrib/man to our generated deb
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ab248675aa9f32c269e0ecbaf78af29583481379
Component: engine
2014-04-07 21:32:17 -06:00
f13ce48af5 Merge pull request #4997 from jpetazzo/apt-should-always-use-https
Use https://get.docker.io/ubuntu consistently
Upstream-commit: 02c5a87b402cb1b575d84a86c118a1efcb6abd7f
Component: engine
2014-04-08 11:24:07 +10:00
4fcce7c1ce Use https://get.docker.io/ubuntu consistently
The install script (on https://get.docker.io/) installs an APT sources.list
entry referencing an HTTPS repository, and takes care of installing the
apt-transport-https package. However, the Debian/Ubuntu specific installation
script (on https://get.docker.io/ubuntu) used an HTTPS repository but without
installing that package, causing the installation to fail on some platforms.

This will use HTTPS everywhere, and updates the documentation accordingly.

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: dc7fefc16bfcc4e6d0ccb30233e50b0ab3d172f1
Component: engine
2014-04-07 11:32:12 -07:00
010f288951 cli integration: fix wait race
The wait at the end of cli integration script could end up failing if
the process had already exited. This was making it look like the tests
have failed.

This change fixes the problem.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 22152ccc47e641050da85b80cebf2912b42fd122
Component: engine
2014-04-04 19:06:55 +03:00
3057a30784 cli integration: allow driver selection via vars
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 62b08f557db91cc5cd12ea9ceb0a4d8cf3d6e0f1
Component: engine
2014-04-04 19:03:07 +03:00
045c683b9b Remove the old Travis-specific files that are no longer necessary
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 919fe7a3a19d79dcbc92050325f46d7a7eb50ebc
Component: engine
2014-04-04 00:46:47 -06:00
6a12ffd870 Add new validate-dco and validate-gofmt bundlescripts for DCO and gofmt validation
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 81370b5b0fc6788bbde32fd9f39c6eee1bcb0c2e
Component: engine
2014-04-04 00:41:33 -06:00