docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,501 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

295 Commits

Author SHA1 Message Date
Doug Davis ecccfa82aa Validate we're not using the old testing stuff 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-23 10:29:47 -07:00
Jessie Frazelle e3e1c2be42 Merge pull request #12376 from Mic92/refactor-hack 
Refactor shellscripts
 2015-04-22 12:12:44 -07:00
Jörg Thalheim 6533cb973f hack/make/test-integration-cli: introduce MAKEDIR variable 
- every execution of dirname costs time
- less repeating

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-04-15 10:44:14 +02:00
Jörg Thalheim ac20568b0a hack: quote all parameters with variable interpolation 
better safe then sorry. especially for rm

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-04-15 10:14:14 +02:00
Tatsushi Inagaki bcd5e20a09 Enable "netgo" library when we build a static binary with gccgo 
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com>
 2015-04-13 21:33:04 -04:00
Michael Crosby 8652ca5d5f Merge pull request #12111 from tianon/builder-deb 
Add "builder-deb" base images for building ".deb" packages properly
 2015-04-13 13:41:17 -07:00
Jessica Frazelle f3ba0a6a35 change tabs to spaces 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-13 12:48:40 -07:00
bobby abbott 3280ce651b Adds validate-vet script 
resolves #11970

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-04-13 12:48:05 -07:00
Eric Windisch 67a983fc37 Use HTTPS for package URL 
Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-04-11 13:21:16 -04:00
Tianon Gravi eee1efcfd6 Add "builder-deb" base images for building ".deb" packages properly 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-04-06 10:43:36 -06:00
Johan Euphrosine 5846914f91 test-unit: fix TESTFLAGS doc 
Signed-off-by: Johan Euphrosine <proppy@google.com>
 2015-04-03 15:05:14 -07:00
Vincent Batts 7617ec176d .: remove trailing white spaces 
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-03-25 13:38:17 -04:00
Tibor Vass 0252ad0adc Revert "Dealing with trailing whitespaces" 
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-03-25 10:04:56 -06:00
Arnaud Porterie 322095ed63 Merge pull request #10681 from noironetworks/whitespaces-cleaner 
Removed all trailing whitespaces from every text file
 2015-03-24 16:02:14 -07:00
Tianon Gravi ae61593417 Fix several very minor consistency issues 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-03-17 23:01:40 -06:00
André Martins 4e65c1c319 Dealing with trailing whitespaces 
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*

Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md

Signed-off-by: André Martins <martins@noironetworks.com>
 2015-03-17 03:34:01 +00:00
Srini Brahmaroutu ec92e84b85 Build docker with gccgo, requires host to contain gccgo 5.0 
Addresses #9207
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-03-16 22:38:26 +00:00
Tianon Gravi 793ebba3d6 Enforce our use of the explicitly frozen images 
This requires that any environment where we wish to run the integration-cli tests includes both the `Dockerfile` and `curl`, which has been deemed an appropriate and acceptable trade-off.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-03-16 14:42:59 -06:00
Derek McGowan 636037c363 Fix test pull verified 
Update pull code to consider any layer download or new tag as an update.
Update hello-world frozen image to be explicitly tagged as frozen, to not interfere with pull tests.  The hello-world is used by pull tests because of its small size and there is no other official image with such a size.

fixes #11383

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-03-16 12:22:00 -07:00
Tianon Gravi 949a21b55f Move scripts back to hack/, leave docs in project/ 
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-03-13 14:04:08 -06:00
Solomon Hykes 32e61b8f5c Move 'hack' to the less confusing 'project' 
We might want to break it up into smaller pieces (eg. tools in one
place, documents in another) but let's worry about that later.

Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-11-09 21:50:28 +00:00
Yohei Ueda dad58737ae Export envvars necessary for unit-test 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
 2014-11-07 16:54:25 +09:00
Yohei Ueda 5bd5ef5a0a Make test-unit runnable without parallel 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
 2014-11-07 02:40:13 +09:00
Jessica Frazelle 7041eb00be Revert "finally, use code generation for INITSHA1 & INITPATH too" 
This reverts commit c7c620dd9f.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-28 16:29:01 -07:00
Jessica Frazelle 17e0a15386 Revert "Use code generation to set IAMSTATIC instead of -X" 
This reverts commit 3e10b93106.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-28 16:25:50 -07:00
Michael Hudson-Doyle c7c620dd9f finally, use code generation for INITSHA1 & INITPATH too 
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
 2014-10-24 11:01:19 +13:00
Michael Hudson-Doyle 3e10b93106 Use code generation to set IAMSTATIC instead of -X 
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
 2014-10-24 10:56:51 +13:00
Tianon Gravi 8ffdf6022e Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-09-28 21:51:44 -06:00
Erik Hollensbe aa129b356f hack: TIMEOUT (for controlling test timeout) and forwarding of 
BUILDFLAGS to binary/dynbinary.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-25 14:25:43 -07:00
unclejack 6db078dea7 Merge pull request #7191 from tiborvass/test-daemon 
Add Daemon restart test along with Daemon utils
 2014-09-02 22:40:23 +03:00
Erik Hollensbe 9a2d4e9273 hack/make: fix test-unit target to propogate TESTFLAGS properly 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-02 12:10:47 -07:00
Tibor Vass 054b921a2c Add Daemon test utils 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-09-02 10:58:36 -07:00
Tianon Gravi ba663eac3a Adjust build tags to be client-only in "make cross" too 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-08-04 15:05:12 -06:00
Tibor Vass 4909a70204 Accept vanilla Linux Foundation signoffs 
This allows signing off commits with `git commit -s`

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-08-01 19:30:34 -04:00
Tianon Gravi 3a14eb066c Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-30 17:02:04 -06:00
Tibor Vass 4cfe806db2 Kill all concurrent jobs on error 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-26 13:45:35 -04:00
Tianon Gravi 0a7cd70924 Fix precompiled unit tests needing their "testdata" contents 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-26 11:46:52 -04:00
Tianon Gravi a6085fd430 Add a bunch more tweaks to the parallel test compilation 
- put all the precompiled test binaries in $DEST so they show up in bundles and can be re-run individually afterwards
- support cases where parallel is not installed (when using dyntest-unit, for example, this is much more common, since it's designed to be run outside the Dockerfile)
- use "mktemp -d" instead of "/tmp" directly for our temporary parallel HOME
- update the default PARALLEL_JOBS to be the value of "nproc" instead of 0, since "0 means as many as possible" (see https://www.gnu.org/software/parallel/man.html#jobs_n)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-26 11:46:36 -04:00
Tibor Vass 158e3068bd compile unit tests in parallel with GNU parallel 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-26 11:46:36 -04:00
Victor Vieux b3ee9ac74e update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-24 22:19:50 +00:00
Tianon Gravi ff08357c9b Fix hack/make/ubuntu to install both docker.service and docker.socket 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-16 23:03:32 -06:00
Tianon Gravi bbbf642427 Fix DCO parsing for numeric github handles like cpuguy83 
Turns out, "alphanumeric" actually means both "alpha" AND "numeric". Dur.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-07 09:57:50 -06:00
Tianon Gravi e895817ad7 Update the Travis GitHub username regex to match the GitHub username requirements 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-07 08:36:31 -06:00
SvenDowideit fa29b1f062 I'm going to wish I didn't do this 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 10:31:56 +10:00
Matthew Heon fa3ac2d370 Fixed manpage generation script and README 
Update md2man script to generate manpages inside docs/man/ directory. Update
usage documentation in the readme to point to the new docs/man path. Update
Ubuntu makefile to use new path to manpages

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
 2014-06-26 15:51:26 -04:00
SvenDowideit 42be6f2957 move the man pages to the docs/ dir 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-06-24 13:07:42 +10:00
Tianon Gravi 506ad22743 Merge pull request #6553 from tianon/disable-netgo-for-dynbinary 
Disable netgo for dynbinary builds
 2014-06-20 17:51:12 -06:00
Tianon Gravi 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
Tianon Gravi 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
Alexandr Morozov 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
Michael Crosby e88ef454b7 Merge pull request #5464 from tianon/close-leftover-fds 2014-04-30 12:27:52 -07:00
Victor Marmol 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
Tianon Gravi 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
Tianon Gravi 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
Guillaume J. Charmes 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
Victor Marmol 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
unclejack 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
Tianon Gravi 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
Guillaume J. Charmes 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
unclejack 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
unclejack 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
Tianon Gravi 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
Tianon Gravi 506055d973 Merge pull request #4853 from pjz/bash_completion 
Include completion scripts in ubuntu/debian package
 2014-04-02 01:40:24 -06:00
unclejack 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
Tianon Gravi 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
unclejack 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
Paul Jimenez 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
Tianon Gravi 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
Sven Dowideit 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
Sven Dowideit 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Guillaume J. Charmes 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
Tianon Gravi 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
Tianon Gravi 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
Victor Vieux 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
Tianon Gravi 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
Fabio Falci 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
Tianon Gravi 277262d9c7 Merge pull request #4205 from tianon/fix-dyntest 
Fix dyntest problems finding dockerinit
 2014-02-18 11:50:16 -07:00
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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
Tianon Gravi 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 07f62f199f Merge pull request #3554 from tianon/ubuntu-dep 
Add ca-certificates to our package Recommends
 2014-01-11 15:07:50 -08:00
Jordan Sissel a02450d048 Use '-s empty' instead of '-s dir' 
This *should* have the same effect as the previous strategy: Instead of
'mkdir empty; fpm -s dir -C empty ...' we can simply do 'fpm -s empty'

Docker-DCO-1.1-Signed-off-by: Jordan Sissel <jls@semicomplete.com> (github: jordansissel)
 2014-01-10 22:36:58 -08:00
Tianon Gravi e5189b5dd2 Add ca-certificates to our package Recommends 
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-10 13:06:53 -07:00
Evan Krall c2a59dfe48 Use gzip compression in Ubuntu packages to make it at least possible to install on Lucid. 
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
 2014-01-10 11:45:00 -08:00
Tianon Gravi 7fd6dcc831 Add stubbed and commented "/etc/default/docker" to our deb package 
This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.
 2014-01-01 22:34:22 -07:00
Tianon Gravi cda146547e Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0" 
Fixes #3372
 2013-12-28 06:35:00 -07:00
Tianon Gravi 4100e9b7df Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos 2013-12-23 23:55:06 -07:00
Guillaume J. Charmes 636dfc82b0 Merge pull request #3064 from tianon/custom-dockerinit-path 
Allow custom dockerinit path
 2013-12-19 14:31:41 -08:00
Tianon Gravi 62a81370ff Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X) 2013-12-19 11:33:49 -07:00
Tianon Gravi fbac812540 Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues 
Also, now that we use "-a", we no longer get any benefit from "go test -i", and it actually causes problems sometimes, so let's nuke it.
 2013-12-18 11:32:25 -07:00
Tianon Gravi a1c5e276f4 Add "-a" back to our "go build" 2013-12-16 23:50:03 -07:00
Tianon Gravi 2ed1001c57 Allow packagers to specify a custom dockerinit lookup location via DOCKER_INITPATH in dynbinary 
Only necessary if distro policy dictates that the path deviate from the paths already listed in utils/utils.go - please refrain from using it otherwise.
 2013-12-16 22:29:08 -07:00
Tianon Gravi 59dc2876a7 Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts 2013-12-13 11:59:54 -07:00
Tianon Gravi f0879a1e14 Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript) 2013-12-08 18:43:24 -07:00
Tianon Gravi ca405786f4 Unify dyntest/test and dynbinary/binary hack bundlescripts further by cross-invocation and keeping all the logic in one place, taking advantage of LDFLAGS_STATIC that is the only bit that gets replaced for dyntest/dynbinary 2013-12-08 18:40:05 -07:00
Tianon Gravi 45cea94a82 Unify hack/make/*test further by invoking hack/make/test directly from dyntest 2013-12-08 15:34:08 -07:00
Tianon Gravi bac3a8e6f5 Add much better pruning of non-tested directories, including pruning the integration tests directory (doing more with "find" and nothing with "grep") 2013-12-08 13:50:48 -07:00
Tianon Gravi dcfc4ada4d Clean output and simplify hack/make/*test by adding go_test_dir function in make.sh 2013-12-08 13:49:57 -07:00
Tianon Gravi 416b16e1e2 Simplify and resync hack/make/test and hack/make/dyntest output handling 2013-12-08 12:57:11 -07:00
Tianon Gravi aea7418d8a Revert "Add cgroup-bin dependency to our Ubuntu package" 
This reverts commit c81bb20f5b.

After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations."

Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces.

The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently.
 2013-12-05 19:03:47 -07:00
Victor Vieux c764fb0c29 Merge pull request #3006 from tianon/ubuntu-cgroup-bin 
Add cgroup-bin dependency to our Ubuntu package
 2013-12-05 16:41:01 -08:00
Victor Vieux 35e80868ad Merge pull request #3004 from tianon/shebang-bash 
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
 2013-12-05 16:04:09 -08:00
Tianon Gravi c81bb20f5b Add cgroup-bin dependency to our Ubuntu package 
Since cgroup-bin is only "recommended" by the lxc package on Ubuntu, but is necessary for having the proper cgroups mounted for Docker to function, this makes some sense for us to add separately.

Fixes #2990
 2013-12-02 16:02:54 -07:00
Guillaume J. Charmes 829b118dd8
Add some color in order to emphasis the test FAILURE 2013-12-02 14:54:01 -08:00
Tianon Gravi 3ac76cfeff Update bundlescript shebangs to be bash, reflecting how they're actually invoked 2013-12-02 15:48:39 -07:00
Guillaume J. Charmes 0017c68f4a
Remove trailing whitespace 2013-12-02 13:52:27 -08:00
Tianon Gravi c30e2dc28c Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS) 2013-12-01 21:20:35 -07:00
Victor Vieux 668d22be54 Merge pull request #2808 from tianon/run-all-tests 
Update test scripts to always run ALL tests, even when some fail
 2013-11-28 16:58:31 -08:00
Tianon Gravi 3314e005f3 Add new bundlescript to build a tgz 2013-11-21 22:34:54 -07:00
Tianon Gravi f1e6dce047 Update test scripts to always run ALL tests, even when some fail 2013-11-21 16:19:19 -07:00
Tianon Gravi 5cdb3aec50 Add clarification of multiple "go test" calls in hack/make/*test 2013-11-12 11:23:06 -07:00
Tianon Gravi 498b6031b1 Update ubuntu packaging script, especially to stop docker group deletion 2013-11-08 17:23:37 -07:00
Tianon Gravi 640682d56c Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS 2013-10-25 15:13:25 -07:00
Solomon Hykes 0c9b319dd0 Hack: fix test and dyntest to correctly use $TESTFLAGS 2013-10-25 15:13:25 -07:00
Tianon Gravi 21161dbd51 Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary 
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
 2013-10-25 15:13:25 -07:00
Tianon Gravi d789750851 Refactor the handling of static-related build flags 
This is as discussed with @shykes on IRC
 2013-10-25 15:13:25 -07:00
Tianon Gravi fb8d488896 Add a few small consistency tweaks in hack 2013-10-25 15:13:25 -07:00
Michael Crosby 1cbdaebaa1 Add links for container relationships and introspection 2013-10-25 15:13:24 -07:00
Tianon Gravi f0dbdba5c0 Merge pull request #2263 from tianon/hack-release 
Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
 2013-10-23 15:31:16 -07:00
Tianon Gravi 2aaaf90320 Update hack/make/ubuntu to make less ubuntu-centric packages, to fix the issue of deleting the docker group on every upgrade, to use the new init library scripts for upstart and sysvinit, and to include the dependency on iptables 2013-10-23 07:38:12 -06:00
Jérôme Petazzoni 8c38c30985 Remove spurious messages, and use proper args expansion. 
Also, display some (hopefully helpful) message when no command was given.
 2013-10-17 23:19:36 -07:00
Solomon Hykes b7abe9dab5 hack: only run certain tests with TESTFLAGS='-run TestName' make.sh 2013-10-15 22:57:40 +00:00
Solomon Hykes 1332f400f7 Merge pull request #2015 from dsissitka/1927 
Configured FPM to make /etc/init/docker.conf a config file.
 2013-10-02 18:18:16 -07:00
Tianon Gravi ccefe47897 Add cleanup/refactor portion of #2010 for hack and Dockerfile updates 2013-09-30 13:57:30 -06:00
David Sissitka c22e377a6d Used tabs for alignment when I should've used spaces. Fixed. 2013-09-26 13:56:59 -07:00
David Sissitka f8c9f11f06 Configured FPM to make /etc/init/docker.conf a config file. 2013-09-26 12:52:43 -07:00
Tianon Gravi aa3de0b849 Add several of the small make.sh fixes from #1920, and make the output more consistent and contributor-friendly, since release instructions already exist in release.sh 2013-09-24 14:36:20 -06:00
Daniel Mizyrycki dfd0deefbb packaging, issue #1647: Add docker groupname on the package release 2013-09-16 23:00:54 -07:00
Solomon Hykes 3d39336a46 Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc. 2013-09-09 18:45:40 -07:00