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
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
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
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
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
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
a12a41609d
Merge pull request #4853 from pjz/bash_completion
...
Include completion scripts in ubuntu/debian package
Upstream-commit: 506055d973ec3a393fa5f8438b41b2318e95b21c
Component: engine
2014-04-02 01:40:24 -06:00
8adb937258
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)
Upstream-commit: f7ae3a1381fdc53042bebec085bb3f108bc05da3
Component: engine
2014-03-31 22:07:23 +03:00
466e144973
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)
Upstream-commit: 3fb1fc0b7b225295b3059cb9a2f5fd9af7a73f36
Component: engine
2014-03-29 23:09:45 +02:00
624997be0f
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
2014-03-29 23:09:40 +02:00
03fb1e8577
Include contributed completions in ubuntu PPA
...
Docker-DCO-1.1-Signed-off-by: Paul Jimenez <pj@place.org > (github: pjz)
Upstream-commit: 4746c761566d5d5d4754daf62d20c83cba0efee8
Component: engine
2014-03-26 11:23:26 -04:00
d4638ba0e0
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)
Upstream-commit: 6b46a09186b6a53959d567014b8d0e1cff761bc8
Component: engine
2014-03-19 22:25:09 -06:00
04a08a7053
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 43febdd432eb8e7dc5988c72710b3d78a5913360
Component: engine
2014-03-20 09:35:58 +10:00
1cf0c29be4
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)
Upstream-commit: 179e2c92d8d02d029d8aa54d53edb82b3fbcea2b
Component: engine
2014-03-20 09:19:47 +10:00
a185dfcddd
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)
Upstream-commit: 50082f792be22b97dcc79afe666289ecefbc3864
Component: engine
2014-03-10 03:27:46 -06:00
fa19c6a895
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)
Upstream-commit: a40bb2aabc1c0aba8b4de82dc353fae322b8831d
Component: engine
2014-03-06 21:22:25 -07:00
2e92b6ef1e
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)
Upstream-commit: be344cf0d8e4f9881724f49398603a6e3109bc89
Component: engine
2014-03-06 19:55:22 -07:00
24c5efffe2
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)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
2014-03-06 13:39:17 -07:00
2ebfedab6d
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: c89fa6645ef87e1863ef5812bd42176f5bd987ca
Component: engine
2014-03-06 12:05:03 -08:00
10b41687cf
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)
Upstream-commit: 5317ad476d9e2c39cf6379fef4ec7f8ba0bcc23a
Component: engine
2014-03-04 22:59:46 -07:00
200f519512
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)
Upstream-commit: b69f63283088e1ac744aafeb08189cb593b30787
Component: engine
2014-03-04 22:52:39 -07:00
5e82277ab6
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 24ff3a3dc30e455674d28f552a0efb6108a411db
Component: engine
2014-02-24 21:59:01 +00:00
56684e6d5f
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)
Upstream-commit: 41b1f93bf72e4c012a159a013697090efdcc183b
Component: engine
2014-02-21 11:26:04 -07:00
3337013302
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)
Upstream-commit: b3d5e9527a050a0c7252f0125a8a26a6fc5175f1
Component: engine
2014-02-19 16:59:51 +00:00
883b90f698
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
Upstream-commit: 277262d9c7ff802092f8cef7172462e4ddd4da02
Component: engine
2014-02-18 11:50:16 -07:00
27672a2f55
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)
Upstream-commit: 6d1c0a91f89887bd0d73b161b1ffe8b9cc10365e
Component: engine
2014-02-18 11:24:33 -07:00
b0d22755b4
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6ccb30a0e5d1146dddaec340643d3950e6f992ef
Component: engine
2014-02-18 11:23:37 -07:00
173cbcacdb
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)
Upstream-commit: c7840f522c37d2c964e442c5acac745f702b8801
Component: engine
2014-02-13 10:27:45 -07:00
9ed97b673b
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)
Upstream-commit: da04f49b383c02ee28c32f948048b9e9a402bb4f
Component: engine
2014-02-11 17:26:54 -07:00
31abecb9fd
Add udev rules file to our generated deb package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 595b8f29869455432e14e58fcdd9c64bc74dd3fd
Component: engine
2014-01-19 17:27:43 -07:00
b4e3b1bdeb
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)
Upstream-commit: 1004c2d3d8ed826e6568f6640ac6aa3160f31a8d
Component: engine
2014-01-13 16:25:23 -07:00
e7a98d831f
Merge pull request #3554 from tianon/ubuntu-dep
...
Add ca-certificates to our package Recommends
Upstream-commit: 07f62f199fa81e9645114589ecaeb888a6084649
Component: engine
2014-01-11 15:07:50 -08:00
6403af89bd
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)
Upstream-commit: a02450d048d0a858aceda2343ef4d7633eca6ebb
Component: engine
2014-01-10 22:36:58 -08:00
5a61d77c34
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)
Upstream-commit: e5189b5dd2c044030e7e2ab7029eba0fe91c3b25
Component: engine
2014-01-10 13:06:53 -07:00
17e2946fdd
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)
Upstream-commit: c2a59dfe48e55bc93e3bed5ecde021f372151b09
Component: engine
2014-01-10 11:45:00 -08:00
92d3a8ac6c
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.
Upstream-commit: 7fd6dcc831d28cc1ca1a5d56c9043354228f087d
Component: engine
2014-01-01 22:34:22 -07:00
af79735338
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
...
Fixes #3372
Upstream-commit: cda146547e59ff875b3eb6202a87004a3f7ea96d
Component: engine
2013-12-28 06:35:00 -07:00
7db2296200
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
...
Upstream-commit: 4100e9b7df5cbce855b47b3625d34c9667e40dc1
Component: engine
2013-12-23 23:55:06 -07:00
cf1704f27a
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
Upstream-commit: 636dfc82b0c9aaddd5b0f5fb0f70797d5068c93e
Component: engine
2013-12-19 14:31:41 -08:00
a7fc58e1eb
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
...
Upstream-commit: 62a81370fffb3cfdb15ef19702f0ea07ab2f4c36
Component: engine
2013-12-19 11:33:49 -07:00
70fa345719
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.
Upstream-commit: fbac8125408c076317f3f51239394cd6b7351b49
Component: engine
2013-12-18 11:32:25 -07:00
2433f050d8
Add "-a" back to our "go build"
...
Upstream-commit: a1c5e276f4cfe4ab498b6e013e61bfc957ce6852
Component: engine
2013-12-16 23:50:03 -07:00
a7db351ec0
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.
Upstream-commit: 2ed1001c57646f6869016739a8e177bb52f32e2a
Component: engine
2013-12-16 22:29:08 -07:00
6a19f653da
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
...
Upstream-commit: 59dc2876a7d2ac0e231d7d97511e572a1d739136
Component: engine
2013-12-13 11:59:54 -07:00
bc39a675a4
Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
...
Upstream-commit: f0879a1e145f31569e9e4e61f429de858bb636ab
Component: engine
2013-12-08 18:43:24 -07:00
8157bab592
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
...
Upstream-commit: ca405786f468a18859684dc13d43a293d47b89bd
Component: engine
2013-12-08 18:40:05 -07:00
c4cf791397
Unify hack/make/*test further by invoking hack/make/test directly from dyntest
...
Upstream-commit: 45cea94a827bfcb77ef53e2e5046df51dc7c113c
Component: engine
2013-12-08 15:34:08 -07:00
