|
|
f83e69dc32
|
Merge branch 'master' into dm
Conflicts:
Dockerfile
buildfile.go
container.go
hack/make/test
runtime_test.go
utils/utils.go
Upstream-commit: e9ee860c91b6e9cdcafc03cff9941affb6341a0d
Component: engine
|
2013-10-18 12:38:29 -07:00 |
|
|
|
4e4f3e50fd
|
hack: fail tests if there are leftover temp files before or after
Upstream-commit: 5cd7de5de8fddd5868c6b85ed1e4f46228c82672
Component: engine
|
2013-10-18 03:31:21 +00: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 |
|
|
|
560c0ccd10
|
hack: don't set DEBUG when running tests
Upstream-commit: 3997b8a923c3e95c14237657f0e2c9301fc5f66d
Component: engine
|
2013-10-15 23:07:26 +00:00 |
|
|
|
242fae9ab3
|
hack: only run certain tests with TESTFLAGS='-run TestName' make.sh
Upstream-commit: ec885d91806595add47c793e1e6bb8a4b9e8d100
Component: engine
|
2013-10-15 23:06:41 +00: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 |
|
|
|
715688eb5e
|
Merged master into device-mapper branch
Upstream-commit: 1804fcba93368b4e115f607e060eb345b0594e62
Component: engine
|
2013-10-10 12:50:30 -07:00 |
|
|
|
345077d21b
|
added initial draft of the Docker infrastructure doc
Upstream-commit: 0d3c899528f00f222080915e800388f5d2821861
Component: engine
|
2013-10-04 15:12:40 -04:00 |
|
|
|
a29076830e
|
hack: Don't just run the "TestRunHostname" test
Upstream-commit: 9b65c7cf49feacad61cdcd11d2b002319a6b6bae
Component: engine
|
2013-10-04 15:38:47 +02:00 |
|
|
|
7dc11f73be
|
Random improvments
Upstream-commit: 8b2f4aab232880cb0d7faa18ae12adb33f483b2c
Component: engine
|
2013-10-02 20:18:15 -07:00 |
|
|
|
788a1fc558
|
Update Dockerfile and hack to support compiling device-mapper code statically (using go1.2rc1)
Upstream-commit: 06d0843a61843e6b16a56d518e21032a5652098b
Component: engine
|
2013-10-03 10:32:47 -06: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 |
|
|
|
02e5d0abf7
|
Merge pull request #2069 from philips/add-xz-to-runtime-dependencies
fix(hack/PACKAGERS): add xz utils as a runtime dep
Upstream-commit: a292c04ddb3d61f17f191c2eb57d0e6af5c5baea
Component: engine
|
2013-10-02 17:37:56 -07:00 |
|
|
|
9a40945c21
|
fix(hack/PACKAGERS): add xz utils as a runtime dep
Upstream-commit: 4f5c2cbccc2ef80f5372ebb4abb38d33343f2c86
Component: engine
|
2013-10-02 12:06:19 -07:00 |
|
|
|
1ada892daf
|
Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
Upstream-commit: cb21a4049052a012fd71dcaceef2bb57e1ed36f8
Component: engine
|
2013-10-01 19:48:50 -06: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 |
|
|
|
fa7d59102d
|
Merge pull request #1970 from dotcloud/cleanup-hack
Cleanup and reorganize docs and tooling for contributors and maintainers
Upstream-commit: 03fe5632d0bba0ce1c7436fe9d94b595069efc6e
Component: engine
|
2013-09-24 10:38:21 -07:00 |
|
|
|
45a3edf527
|
Hack: correct typo in release checklist
Upstream-commit: f6c64827c899b1fd737df0fcd018cc33dd9a91b9
Component: engine
|
2013-09-23 18:43:08 -07:00 |
|
|
|
8e947a6f47
|
Add @tianon to hack/MAINTAINERS
Upstream-commit: a4067b1b441fac478d2c745981c464390f73a357
Component: engine
|
2013-09-23 12:39:14 -06:00 |
|
|
|
7057328389
|
Hack: update README
Upstream-commit: fa3837abf1fd796cf8142a62eaece8decfa2ec6b
Component: engine
|
2013-09-23 11:26:05 -07:00 |
|
|
|
ca189d7192
|
Update maintainer's manual: every change should be done in a pull request.
Upstream-commit: baff72bc82281b7fa545e0782722b9804240cf6e
Component: engine
|
2013-09-23 11:26:05 -07:00 |
|
|
|
4a859df333
|
Hack: update release checklist and reference it in REAMDE
Upstream-commit: 99377de7d2c48e25cb13928605c90ea40eab5b35
Component: engine
|
2013-09-23 11:26:04 -07:00 |
|
|
|
d9a3a46bf0
|
hack/MAINTAINERS.md: a maintainer's manual.
Upstream-commit: 0ef5bcb17d77e575c808003856c7a6ed134b04f2
Component: engine
|
2013-09-23 11:26:04 -07:00 |
|
|
|
02fca5dc5a
|
Hack: remove deprecated files
Upstream-commit: fd1c43f0e05133249ef441444a740b81db3b90ce
Component: engine
|
2013-09-23 11:26:03 -07:00 |
|
|
|
acea376687
|
Update tar dependency to newest version
Upstream-commit: cfbe76e5595b66e43447d6e1f3de40946af066f4
Component: engine
|
2013-09-23 09:59:04 -07: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 |
|
|
|
c157c0dfdc
|
Add MAINTAINERS
Making sure we're consistent across our project.
Upstream-commit: d6cf41cbe62ffaf2ed5bedf107d8bc4f804d3658
Component: engine
|
2013-09-16 04:45:01 +00:00 |
|
|
|
04ac9582d3
|
hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in
Upstream-commit: 45cedefadb444e8d7305defd246c63537fca04df
Component: engine
|
2013-09-11 18:38:09 -07:00 |
|
|
|
7ba861bda7
|
hack/make.sh print a warning but don't exit if called outside a correct build environment.
Upstream-commit: ebee8f28ac45e7907a35331383f8b9b4ab338353
Component: engine
|
2013-09-10 18:08:02 -07:00 |
|
|
|
ed8387023e
|
Fix typo and add dependency details in hack/PACKAGERS.md
Upstream-commit: 03e36caeb12eb5b936de8cec29998c61fc02f037
Component: engine
|
2013-09-10 18:02:33 -07:00 |
|
|
|
c63c08e39f
|
Remove fixed FIXMEs
Upstream-commit: 228b7af516e023984a3d0ceba98c639cec9695d0
Component: engine
|
2013-09-10 11:33:37 -07:00 |
|
|
|
5e2f733cce
|
Update usage comments in hack/make.sh
Upstream-commit: d14058bc29512918ffd4e7413c6d5ae8524088ed
Component: engine
|
2013-09-10 11:33:26 -07:00 |
|
|
|
47c1ee3661
|
Packager's manual: official build vs distro build
Upstream-commit: 5b361f31f7d4eb547cbf60fda2968537600772ca
Component: engine
|
2013-09-10 11:30:14 -07:00 |
|
|
|
ab16a55cf8
|
PACKAGERS.md: a guide to packaging Docker for your favorite distro
Upstream-commit: 14bbbcd57181f9d6e908b2e84474e731314d0d77
Component: engine
|
2013-09-09 23:39:55 -07:00 |
|
|
|
173e478738
|
Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc.
Upstream-commit: 3d39336a46a0d7f411467d29eb6328dc1ab3e900
Component: engine
|
2013-09-09 18:45:40 -07:00 |
|
|
|
1dc33725a8
|
Add the output of the tests to each release
Upstream-commit: 59856a20bfbad6f59308071fda220a04c3b0df09
Component: engine
|
2013-09-09 16:30:24 -07:00 |
|
