Commit Graph

143 Commits

Author SHA1 Message Date
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
83a4080e03 docker-ci 0.40. Migrate docker-ci to Digital Ocean.
Upstream-commit: e7df38dbd0c7bf2d27632809fc49cacb0cc7f869
Component: engine
2013-11-06 19:13:58 -08:00
837c6b480c docker-ci 0.37. Patch hack/dind with latest code for docker-test.
Upstream-commit: efb4c800a7c8167cf2202466a720c0fad7001a5d
Component: engine
2013-11-06 19:13:58 -08:00
7a7c9f0f1d docker-ci 0.36. Patch hack/dind with latest code for nightly release to work.
Upstream-commit: 0cbeda73910d6d1d3336da93c5f94df0bdd5fa44
Component: engine
2013-11-06 19:13:58 -08:00
aac90cd92e docker-ci 0.35. Push docker coverage and testing into docker-ci production. Update docker nightlyrelease
Upstream-commit: 17172276366fc3114ae52eb6c83aafbec004d5f3
Component: engine
2013-11-06 19:13:58 -08:00
6b8ac9d257 testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker
Upstream-commit: 50dd9791f75efef77a85bbe6556c85de0d845c0a
Component: engine
2013-11-06 19:13:58 -08:00
5e4f415366 Refactor HostConfig and escape apparmor confinement
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
ce0d02b06f Merge pull request #2305 from mzdaniel/1800-testing-dind
Testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker
Upstream-commit: e37a7d49818581a17303aacd06baf1db6835cfd6
Component: engine
2013-10-31 09:42:19 -07:00
85374b0f04 update RELEASE-CHECKLIST.md to reflect new changes
Upstream-commit: 9420e8def7023b5247858518e43bd7ab4f2b5e48
Component: engine
2013-10-29 15:34:33 -07:00
0c26d0cb6e Clarify Go 1.2rc2 / Go 1.1.2 requirements in hack/PACKAGERS.md
Upstream-commit: ff147707b2382cc3d9f09fc09b306d4c50a39dfd
Component: engine
2013-10-29 13:41:26 -06:00
dd841b9500 Add SQLite dep to hack/PACKAGERS.md and clean up a few other tiny inconsistencies
Upstream-commit: b283900764eac4947dc3239ced56e1c74e98809d
Component: engine
2013-10-28 21:57:20 -06: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
d3bb38b0f9 Merge pull request #2378 from tianon/linkify-github-ids
Linkify @github references in the infrastructure README.md
Upstream-commit: 279791bc7426b5fc940927b0a2e45ba3182856a4
Component: engine
2013-10-25 11:30:25 -07:00
a7e39af256 Merge pull request #2364 from tianon/sudo-modprobe
Fix install.sh with $sh_c to get sudo/su for modprobe
Upstream-commit: 98c94dd4dbd900044ca807b763966858e61df597
Component: engine
2013-10-24 11:24:23 -07:00
400a33f8d2 Linkify @github references in the infrastructure README.md
Upstream-commit: c9375d14fc6b7f2a0d3b40fc736b6aed20e010d3
Component: engine
2013-10-24 11:54:06 -06: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
cea1ec67ae Fix install.sh with $sh_c to get sudo/su for modprobe
Upstream-commit: 0324e567ad60d66358075bf866299abeae5241b3
Component: engine
2013-10-23 15:48:30 -06:00
bab3ffd21b Merge pull request #2226 from tianon/init
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
Upstream-commit: ef5cf6c1ec88c71465075f272e58150ae26d25fa
Component: engine
2013-10-23 14:29:41 -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
5cdd5ff8f0 Update hack/install.sh with some more Ubuntu-specific installation stuff while we're still on AUFS (installing linux-image-extra-$(uname -r) when we can't find AUFS to try to find AUFS)
Upstream-commit: 3b0cbc59ea4da94cd9013fe60e83919d1a5859aa
Component: engine
2013-10-19 23:56:14 -06:00
8802449935 testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker
Upstream-commit: 95f3f77fc417bbc55f03e869136deec27e26bc51
Component: engine
2013-10-18 22:33:16 -07:00
b75aa9ace9 Change bundle order, and fix shell array expansion.
I believe that it is helpful to build the binary first. That way,
if you interrupt the tests, you still get a binary to play with.
If you run the tests first and interrupt them, no binary for you!

Also, the second part of this commit is an undeniable proof that
Bash array syntax is nothing else than an elaborate troll by Bash
authors.
Upstream-commit: 85956c70b5613439d9f239550c5c4ec360339cb6
Component: engine
2013-10-17 23:20:18 -07: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
40ae0bfbb2 Work around an exotic bug affecting Docker-in-Docker + systemd.
Upstream-commit: 255b6aadfacfd346ef413a1ffd945360276cbcf6
Component: engine
2013-10-17 20:42:11 -07:00
b73b1d5688 Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues
Upstream-commit: 83a2e92d47bc1d78a44b9508656725a043f08b6b
Component: engine
2013-10-17 16:49:35 -06:00
427dad8458 Add Stackbrew.
Upstream-commit: d401e9d3ace06d3291ddd96a8ab8aa690d5935dc
Component: engine
2013-10-17 14:11:10 -07:00
04a26ac7f0 Try a different presentation of infrastructure documentation.
Upstream-commit: 7b1c6ccabd1c1276c80abc1e818b45804a5d05ed
Component: engine
2013-10-16 17:11:21 -07:00
5f90a0b230 testing infrastructure, PR #2195: Add aggregated docker-ci email report
Upstream-commit: a2ffa637ceb694b1e7a21972a9482a0c9c1676c8
Component: engine
2013-10-16 13:30:15 -07:00
7d69f30bb3 Merge pull request #2231 from metalivedev/1919-docreleaseinfo
Fix #1919 document how to edit and release docs.
Upstream-commit: 65b62307c35bfe58ee345de622c1779a01f2d178
Component: engine
2013-10-16 10:45:01 -07:00
64a054faa9 Merge pull request #2090 from kencochrane/master
added initial draft of the Docker infrastructure doc
Upstream-commit: 03e5d94b123a47626fc440fe681981fd03b94cb4
Component: engine
2013-10-16 10:44:22 -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
6c0068a0fa Fix #1919 document how to edit and release docs.
Upstream-commit: cd455ca6fa3a899153880a7b95b9d07762b4c97c
Component: engine
2013-10-15 15:52:21 -07:00
23160a9e26 Prevent docker-ci to test closing PRs
Upstream-commit: 53a07d547554adc61b82f3ff794c0c9c0686be73
Component: engine
2013-10-14 14:00:06 -07:00
fc812228ba Merge pull request #1823 from dotcloud/1766-nightly-release
testing, issue #1766: Add nightly release to docker-ci
Upstream-commit: 620bc5b9e1cdc04e61821fa0775656fd0227da59
Component: engine
2013-10-11 17:38:06 -07:00
b33972f66c Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.), thus making it an official script and moving it to hack/
Upstream-commit: 94bf5b00112890ed84c38b9840802fa0142b507b
Component: engine
2013-10-11 00:53:15 -06:00
029a9420f7 testing infrastructure, issue #1766: Dockerize deployment of docker-ci
Upstream-commit: d542318d63b847e4494a2688b091baeb5dbde1e1
Component: engine
2013-10-10 18:29:10 -07:00
168dc23d28 testing, issue #1766: Upgrade tooling for Docker nightly release
Upstream-commit: fac190959ffbacc95e34fc8615ff82879f8ffd18
Component: engine
2013-10-10 18:29:10 -07:00
3b2cc7dac9 testing, issue #1766: Add nightly release to docker-ci
Upstream-commit: 1dcdc3deb7cc41fe3c84c579df19c9578098a172
Component: engine
2013-10-10 18:29:10 -07:00