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
a3942a6d82
Add much better pruning of non-tested directories, including pruning the integration tests directory (doing more with "find" and nothing with "grep")
...
Upstream-commit: bac3a8e6f5eca31108787b98d5659523eefa6a30
Component: engine
2013-12-08 13:50:48 -07:00
1f4109a158
Clean output and simplify hack/make/*test by adding go_test_dir function in make.sh
...
Upstream-commit: dcfc4ada4dcc8b1f878370976f29ca0485e690f8
Component: engine
2013-12-08 13:49:57 -07:00
9726885de6
Simplify and resync hack/make/test and hack/make/dyntest output handling
...
Upstream-commit: 416b16e1e200420644072b354b9595ffa9474682
Component: engine
2013-12-08 12:57:11 -07:00
f35e7a7cde
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b2b5d86059c6004e60ba23b03d30fe0.
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.
Upstream-commit: aea7418d8ac73f072a47affcaab04831c2f43bc2
Component: engine
2013-12-05 19:03:47 -07:00
bd4e7f6cb9
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
Upstream-commit: c764fb0c294a37b6cf9aad68822be9b349449e6e
Component: engine
2013-12-05 16:41:01 -08:00
3365b34767
Merge pull request #3004 from tianon/shebang-bash
...
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
Upstream-commit: 35e80868addd9ac5a2c1e006e650ac3e71f52c6a
Component: engine
2013-12-05 16:04:09 -08:00
abbb76e290
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
Upstream-commit: c81bb20f5b2b5d86059c6004e60ba23b03d30fe0
Component: engine
2013-12-02 16:02:54 -07:00
247a658901
Add some color in order to emphasis the test FAILURE
...
Upstream-commit: 829b118dd8fbfb9ce1585c15699cf6221c328802
Component: engine
2013-12-02 14:54:01 -08:00
d18e13a2e4
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
...
Upstream-commit: 3ac76cfeffafcfdc3688fda58cb29d9bb7f6149b
Component: engine
2013-12-02 15:48:39 -07:00
ac96c6da33
Remove trailing whitespace
...
Upstream-commit: 0017c68f4a56f9250b53e4f8efdf3513b051c1a3
Component: engine
2013-12-02 13:52:27 -08:00
f474881303
Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS)
...
Upstream-commit: c30e2dc28c53664a4ad241a682355332af3371d2
Component: engine
2013-12-01 21:20:35 -07:00
1c0208b60e
Merge pull request #2808 from tianon/run-all-tests
...
Update test scripts to always run ALL tests, even when some fail
Upstream-commit: 668d22be5485e3f25f836788d62683828cd621fe
Component: engine
2013-11-28 16:58:31 -08:00
c1747d1722
Add new bundlescript to build a tgz
...
Upstream-commit: 3314e005f32f7440f1cc9009b0a453eed45ce9de
Component: engine
2013-11-21 22:34:54 -07:00
cbf3a12f02
Update test scripts to always run ALL tests, even when some fail
...
Upstream-commit: f1e6dce047d091bc4b4ea9264a29401f39381fa6
Component: engine
2013-11-21 16:19:19 -07:00
78d1d60f74
Add clarification of multiple "go test" calls in hack/make/*test
...
Upstream-commit: 5cdb3aec507d9df7bb98366f04c4303a2172cbd5
Component: engine
2013-11-12 11:23:06 -07:00
1fdd529660
Update ubuntu packaging script, especially to stop docker group deletion
...
Upstream-commit: 498b6031b12da56c442d7c2b501f500766652b2d
Component: engine
2013-11-08 17:23:37 -07:00
d166ef5e10
Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS
...
Upstream-commit: 640682d56c9694da092e084492e3f3e96bca5c76
Component: engine
2013-10-25 15:13:25 -07:00
fba538a259
Hack: fix test and dyntest to correctly use $TESTFLAGS
...
Upstream-commit: 0c9b319dd0c29621c76cf63d494c9781e3f4ea00
Component: engine
2013-10-25 15:13:25 -07:00
7f47a302d5
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.
Upstream-commit: 21161dbd515fb97cf9052a5980de6fc6180a89dc
Component: engine
2013-10-25 15:13:25 -07:00
abf7c9daea
Refactor the handling of static-related build flags
...
This is as discussed with @shykes on IRC
Upstream-commit: d7897508516c05e7ffea5b96053ec80c7771d777
Component: engine
2013-10-25 15:13:25 -07:00
98fe860f99
Add a few small consistency tweaks in hack
...
Upstream-commit: fb8d488896bd147aa810c9736fce1186b8d769b5
Component: engine
2013-10-25 15:13:25 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
002ca069aa
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
Upstream-commit: f0dbdba5c00f988da893627fe7b9d54b95bc7157
Component: engine
2013-10-23 15:31:16 -07:00
a5e651dbd2
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
...
Upstream-commit: 2aaaf9032052af472aaf2eaa1a5b934c9bfeb0a8
Component: engine
2013-10-23 07:38:12 -06:00
70d38dc0d4
Remove spurious messages, and use proper args expansion.
...
Also, display some (hopefully helpful) message when no command was given.
Upstream-commit: 8c38c309851c2a44b9c12bac8f29bc011ea4040f
Component: engine
2013-10-17 23:19:36 -07:00
ac2cdb6787
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
...
Upstream-commit: b7abe9dab56f79e410ef2821cbea6344a65b555b
Component: engine
2013-10-15 22:57:40 +00:00
6963be7e37
Merge pull request #2015 from dsissitka/1927
...
Configured FPM to make /etc/init/docker.conf a config file.
Upstream-commit: 1332f400f7281aa726e4148b0831e5ccfec14a4d
Component: engine
2013-10-02 18:18:16 -07:00
33aa0c2b85
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
...
Upstream-commit: ccefe47897bdcef8b56bf54d4bd324989855f3b5
Component: engine
2013-09-30 13:57:30 -06:00
6693d06bc7
Used tabs for alignment when I should've used spaces. Fixed.
...
Upstream-commit: c22e377a6d36816210803e34e4d73cf45a4aa828
Component: engine
2013-09-26 13:56:59 -07:00
f400840b85
Configured FPM to make /etc/init/docker.conf a config file.
...
Upstream-commit: f8c9f11f067ef94a35cbc35b8d15f67d57ce1aec
Component: engine
2013-09-26 12:52:43 -07:00
23abc9f334
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
...
Upstream-commit: aa3de0b8499f8f42e0414099b2397179df35358b
Component: engine
2013-09-24 14:36:20 -06:00
588e45b7bc
packaging, issue #1647 : Add docker groupname on the package release
...
Upstream-commit: dfd0deefbb5325901608c85319dd357146d5370a
Component: engine
2013-09-16 23:00:54 -07:00
