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
d29d3cbd93
add gosqlite to vendor.sh
...
Add gosqlite and its latest revision to vendor.sh so that the vendor
directory can be reliably recreated.
Upstream-commit: d215724ad6f70a783cb00b77f3c1a0cf9f69c83e
Component: engine
2013-12-19 13:51:46 -06: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
7b1b83e614
Merge pull request #3238 from tianon/go-build-a
...
Readd go build -a
Upstream-commit: be0beb897aeed280fe1964feaebe4411b5547fc8
Component: engine
2013-12-17 20:40:36 -08:00
3d79d324f2
Merge pull request #3237 from tianon/hack-fix-cover-detection
...
Fix "go tool cover" detection to only add -cover and -coverprofile if we...
Upstream-commit: 5204feeaa98a58602d02e81e567dabf1f762921e
Component: engine
2013-12-17 10:09:40 -08:00
d083287985
Purge more hack references to Go 1.1.2 (since it requires backported archive/tar patches now, and Go 1.2 is _widely_ packaged successfully)
...
Upstream-commit: 5e9b4a23e6bde9e7d65ebc8b4bdfec4e1486df3a
Component: engine
2013-12-16 23:57:54 -07:00
2433f050d8
Add "-a" back to our "go build"
...
Upstream-commit: a1c5e276f4cfe4ab498b6e013e61bfc957ce6852
Component: engine
2013-12-16 23:50:03 -07:00
55aa26742d
Fix "go tool cover" detection to only add -cover and -coverprofile if we both have cover support in Go, and if we have the cover tool downloaded
...
Upstream-commit: eddda577a4dd7f8fb4fb67fd1600c2a7c5de40c7
Component: engine
2013-12-16 22:54:06 -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
433f293713
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
Upstream-commit: 23ab0af2ff3083f475b67787cc5619ead5524948
Component: engine
2013-12-13 10:55:49 -08:00
8b030b6f33
Merge pull request #3194 from tianon/tianon-hack-maintainer
...
Make Tianon the hack maintainer
Upstream-commit: b8a16b34599b9497615606de733a4f6452683b5e
Component: engine
2013-12-13 10:55:07 -08:00
161e9b78f9
dockerinit: drop capabilities
...
Drop capabilities in dockerinit instead of with lxc utils, since
libvirt-lxc doesn't support it.
This will also be needed for machine container mode, since dockerinit
needs CAP_SYS_ADMIN to setup /dev/console correctly.
Upstream-commit: b8f1c7370516a4eec0d3168d594a7d7d92e7f8e9
Component: engine
2013-12-12 13:47:24 -06:00
2d710e71c8
Make Tianon the hack maintainer
...
Upstream-commit: 0db1c60542d3570558bad09eddd3b2b605e55e4e
Component: engine
2013-12-12 11:25:30 -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
528954d272
Hack: stats.sh prints useful project stats for maintainers
...
Upstream-commit: edace08327675967700a5ff8093ee3104a91772f
Component: engine
2013-12-08 01:47:03 +00: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
f2f4f227e1
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
Upstream-commit: dc9f8bf072dfb65f32c6dc569d133361030daa0a
Component: engine
2013-12-04 11:06:13 -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
44554632a3
Update to Go 1.2 officially, now that it is released
...
Upstream-commit: 5c5f6709017575b0b090cb5f76b75e7e733ffa2b
Component: engine
2013-12-01 15:11:10 -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
3e874ec270
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
Upstream-commit: 89454851d12c73c2865799c3d192eeaf55746b87
Component: engine
2013-11-27 10:04:55 -08:00
18e7ca81c6
Merge pull request #2815 from tianon/hack-make-tgz
...
Add tgz bundlescript
Upstream-commit: 8bd6127ab357a84bb95c8dc69373232549f2c96a
Component: engine
2013-11-25 21:29:14 -08:00
170040a202
Add a few more small RELEASE-CHECKLIST tweaks, fixes, and improvements
...
Upstream-commit: 37e00831691567e30365c9e9ced5aa90a70f6221
Component: engine
2013-11-22 11:46:15 -07:00
cacce7d99b
Add new tgz bundlescript to default make and release
...
Upstream-commit: b3f5973f41eeb0e445b16ec0813b7996fba2fde7
Component: engine
2013-11-21 22:34:54 -07:00
c1747d1722
Add new bundlescript to build a tgz
...
Upstream-commit: 3314e005f32f7440f1cc9009b0a453eed45ce9de
Component: engine
2013-11-21 22:34:54 -07:00
21b63b0713
update release checklist
...
Upstream-commit: 58f8503b7340ca34b229609a2dcb4b0fede1e638
Component: engine
2013-11-21 18:34:23 -08: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
a0108629ac
Add support for compiling using make.sh without '.git' (ie, from a Github tarball, for example)
...
Upstream-commit: efd0e13ca7e11e6422faf63986f443fe0df0cece
Component: engine
2013-11-21 15:11:17 -07:00
c226d5fb61
utils: remove dotcloud/tar dep
...
Upstream-commit: b3bee7e0c43dd281c081cd59d7403148d3f8af88
Component: engine
2013-11-20 18:45:12 +00:00
6d93aad6a7
Typo in ROADMAP.md
...
Upstream-commit: 87b4bb9fcc41806da4ed3151e74511120c099115
Component: engine
2013-11-13 12:32:49 +00:00
cd79a08f60
Merge pull request #2612 from tianon/release-script-tweaks
...
* Hack: release script tweaks
Upstream-commit: 3885ef585bf132a04e174f32e6bb7e86d7730c32
Component: engine
2013-11-12 15:04:26 -08: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
e4cf9cf4dc
Fix the display of get.docker.io in Firefox by making our index files text/plain
...
Upstream-commit: 7f1b179c67476efa7dbafda55541b515fbe0f346
Component: engine
2013-11-09 02:28:04 -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
0ed69503c9
Update release script to move https://get.docker.io/ubuntu/info to https://get.docker.io/ubuntu/ and provide a backwards-compatibility redirect (same for /builds/info)
...
Upstream-commit: f56945d71bcce6e7d18b3471bf4744ddd70b1783
Component: engine
2013-11-08 15:45:18 -07:00
db48d3cf28
Update release script with proper support for non-*.docker.io bucket URLs
...
Upstream-commit: b8e7ec1b74fdeaeab56a8ffab801dcd87b7361ca
Component: engine
2013-11-08 15:44:52 -07:00
ba4e682cde
docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD.
...
Upstream-commit: 249f76bebdb3c24ae0a59e3be7ae73fd1d88c065
Component: engine
2013-11-06 20:05:26 -08:00
