506ad22743
Merge pull request #6553 from tianon/disable-netgo-for-dynbinary
...
Disable netgo for dynbinary builds
2014-06-20 17:51:12 -06:00
986a151b8a
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 15:06:34 -06:00
3f7909e996
Disable netgo for dynbinary builds
...
It's not necessary to use the netgo implementation for non-static builds. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 14:35:30 -06:00
7cd1e48230
Fix hanging on tests failing
...
Tee hanging when `go test` exit with non-zero code.
Fixes #5672
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-05-19 08:26:05 +04:00
e88ef454b7
Merge pull request #5464 from tianon/close-leftover-fds
2014-04-30 12:27:52 -07:00
a39f3c9200
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)
2014-04-29 23:26:27 +00:00
d5d62ff955
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)
2014-04-29 16:45:28 -06:00
a96cac4d7d
Merge pull request #5477 from vmarmol/add-testdirs
...
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
2014-04-29 16:40:40 -06:00
2c85468753
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)
2014-04-29 14:37:06 -07:00
6e05c420c9
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)
2014-04-29 20:55:04 +00:00
c8381d6722
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)
2014-04-28 22:26:25 -06:00
e4114e6b94
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)
2014-04-28 22:22:31 -06:00
314818e7ba
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)
2014-04-28 17:08:03 -06:00
e55ed741c2
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)
2014-04-21 10:42:46 -07:00
7bb72fa080
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)
2014-04-14 13:35:54 -06:00
449f92f11e
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)
2014-04-13 15:06:15 +03:00
28e7e81479
Merge pull request #5072 from tianon/hack-set-e-consistently
...
Update bundlescripts to use "set -e" consistently
2014-04-10 13:37:36 -06:00
7dd9c208fd
Merge pull request #5069 from tianon/hack-make-ubuntu-man
...
Add contrib/man to our generated deb
2014-04-10 08:04:04 -07:00
b298960aed
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)
2014-04-09 12:11:06 -06:00
566d49c9ca
Merge pull request #5022 from tianon/make-validate
...
Add "make validate" for both local and CI gofmt and DCO verification
2014-04-08 19:17:30 -06:00
4c3eb7db67
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)
2014-04-07 23:10:40 -06:00
ab248675aa
Add contrib/man to our generated deb
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-07 21:32:17 -06:00
22152ccc47
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)
2014-04-04 19:06:55 +03:00
62b08f557d
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)
2014-04-04 19:03:07 +03:00
81370b5b0f
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)
2014-04-04 00:41:33 -06:00
506055d973
Merge pull request #4853 from pjz/bash_completion
...
Include completion scripts in ubuntu/debian package
2014-04-02 01:40:24 -06:00
f7ae3a1381
integration-cli: pull busybox before running
...
Make sure the busybox image is ready to be used when running the cli
integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-31 22:07:23 +03:00
3fb1fc0b7b
Small tweaks to the hack scripts to make them simpler
...
Please do with this as you please (including rebasing and/or squashing it), especially under clause (c) of the DCO.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-29 23:09:45 +02:00
6db32fdefd
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-29 23:09:40 +02:00
4746c76156
Include contributed completions in ubuntu PPA
...
Docker-DCO-1.1-Signed-off-by: Paul Jimenez <pj@place.org> (github: pjz)
2014-03-26 11:23:26 -04:00
6b46a09186
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-19 22:25:09 -06:00
43febdd432
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-20 09:35:58 +10:00
179e2c92d8
Generate md5 and sha265 hashes when building, and upload them in hack/release.sh
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-20 09:19:47 +10:00
50082f792b
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-10 03:27:46 -06:00
a40bb2aabc
Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 21:22:25 -07:00
be344cf0d8
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 19:55:22 -07:00
0b23393ba1
Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 13:39:17 -07:00
c89fa6645e
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-06 12:05:03 -08:00
5317ad476d
Add "git" to our Ubuntu package "Recommends" (whoops, this should've been in here for a while now)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:59:46 -07:00
b69f632830
Update package deps to remove LXC and move aufs-tools to be in "Recommends" instead of strict Depends
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:52:39 -07:00
24ff3a3dc3
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-02-24 21:59:01 +00:00
41b1f93bf7
Add simple "grep" to hide the harmless "warning: no packages being tested depend on ..." in "go test -coverpkg ..." output
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-21 11:26:04 -07:00
b3d5e9527a
Package coverage when running integration tests
...
If coverpkg is missing on `go test` command, only the current package
will be covered. That's the case of unit tests. For integration tests
we need to explicitly declare each package.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-02-19 16:59:51 +00:00
277262d9c7
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
2014-02-18 11:50:16 -07:00
6d1c0a91f8
Add "Conflicts" to our lxc-docker package to make it more clear that we can't/shouldn't be installed alongside either "docker" or "docker.io"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-18 11:24:33 -07:00
6ccb30a0e5
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-18 11:23:37 -07:00
c7840f522c
Add shasum fallback to hack/make/dynbinary for Darwin (where sha1sum is not available)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-13 10:27:45 -07:00
da04f49b38
Move even more stuff into dockerversion
...
Also, use it in all the places. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-11 17:26:54 -07:00
595b8f2986
Add udev rules file to our generated deb package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-19 17:27:43 -07:00
1004c2d3d8
Add xz-utils to our deb-recommends since it's necessary for some images
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-13 16:25:23 -07:00
Tianon Gravi
Alexandr Morozov
Michael Crosby
Victor Marmol
Guillaume J. Charmes
unclejack
Paul Jimenez
Sven Dowideit
Sven Dowideit
Guillaume J. Charmes
Victor Vieux
Fabio Falci