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