Tianon Gravi
59fe36623b
Merge pull request #3599 from tianon/fix-install-sed
...
Fix release.sh sed of install.sh so we preserve tests against 'https://get.docker.io/ '
2014-01-16 16:54:39 -08:00
Tianon Gravi
40b40cffb1
Clean and simplify vendor.sh while making it easier to maintain as well
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-15 22:20:51 -07:00
Tianon Gravi
221454f315
Fix release.sh sed of install.sh so we preserve tests against ' https://get.docker.io/ '
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 19:29:02 -07:00
Tianon Gravi
bfc256f6c9
Merge pull request #3581 from tianon/deb-xz-utils
...
Add xz-utils to our deb-recommends since it's necessary for some images
2014-01-14 12:07:10 -08:00
Tianon Gravi
f700aa1570
Fix Travis to not check gofmt on vendor/*
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-14 11:07:18 -07:00
Tianon Gravi
1004c2d3d8
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)
2014-01-13 16:25:23 -07:00
Tianon Gravi
07f62f199f
Merge pull request #3554 from tianon/ubuntu-dep
...
Add ca-certificates to our package Recommends
2014-01-11 15:07:50 -08:00
Tianon Gravi
7273b33e86
Merge pull request #3551 from tianon/test-docker-io-gpg-fingerprint
...
Inline the test.docker.io fingerprint in the install.sh script as well
2014-01-11 15:07:06 -08:00
Tianon Gravi
f65706aaeb
Merge pull request #3500 from tianon/lvm2-version
...
Add more specific lvm2 version to PACKAGERS document
2014-01-11 03:39:01 -08:00
Jordan Sissel
a02450d048
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)
2014-01-10 22:36:58 -08:00
Tianon Gravi
e5189b5dd2
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)
2014-01-10 13:06:53 -07:00
Evan Krall
c2a59dfe48
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)
2014-01-10 11:45:00 -08:00
Tianon Gravi
051e7a0bef
Inline the test.docker.io fingerprint in the install.sh script as well
...
As long as we're doing it, we ought to do it for all the "official" Docker properties at least
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-10 10:20:31 -07:00
Tianon Gravi
a4f3cd62a3
Update Travis to check for new 1.1 DCO version
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-09 09:52:17 -07:00
Michael Crosby
ee65633620
Merge pull request #3446 from tianon/update-checklist
...
Update release checklist with more information, more commands, and more ...
2014-01-08 15:37:49 -08:00
Tianon Gravi
7626e9fd64
Add more specific lvm2 version to PACKAGERS document
...
I personally tested this using our container, and this was the lowest version that compiles and runs properly.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-08 00:27:50 -07:00
Tianon Gravi
b57051a724
Update release checklist with more information, more commands, and more correct flow (test, upload to test.docker.io, test, upload to get.docker.io, THEN tag&merge)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-07 18:28:07 -07:00
zimbatm
94c803e9f0
Fixes key installation for other target urls in hack/install.sh
...
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com> (github: zimbatm)
2014-01-08 01:08:14 +00:00
zimbatm
13ebc68636
Makes sure the GPG key fingerprint is inlined in the doc everywhere.
...
Instead of `curl $url | apt-get add -` use the ubuntu keyserver and a full
fingerprint to retreive the key. This makes the distribution of the GPG key
more secure an less likely to change even if 3rd party gains access to the
packages repository.
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com> (github: zimbatm)
2014-01-08 01:07:04 +00:00
Tianon Gravi
3779291e9b
Fix Travis handling of a fully-numeric commit hash being YAML-converted to a number instead of a string
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-07 15:27:51 -07:00
Tianon Gravi
7c4e5fbd46
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master", and to also ignore commits with no content (like a Merge commit - there's no need to sign off on literally nothing)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-07 13:45:40 -07:00
Tianon Gravi
561d1db074
Add Travis CI configuration to validate DCO and gofmt
...
After each push, Travis CI will trigger, and check two things:
- make sure that each commit in the push has the Docker certificate of origin
- make sure that all .go files changed by this sequence of commits are correctly formatted in the most recent commit
Note: there is one edge case; if you do a git force push, we cannot figure out the actual commits in the force push, and we will just run the checks as if upstream master were the base. Pull requests will always be tested correctly, though.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-07 08:25:54 -07:00
sudosurootdev
2a1181f404
Spelling error.
2014-01-04 23:15:15 -05:00
Tianon Gravi
7fd6dcc831
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.
2014-01-01 22:34:22 -07:00
Tianon Gravi
5f55784224
Merge pull request #3374 from tianon/fpm-license-vendor
...
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
2014-01-01 14:42:47 -08:00
Tianon Gravi
40522c0380
Merge pull request #3392 from tianon/fix-install-failure
...
Fix install failure when busybox can't be downloaded
2013-12-30 20:04:30 -08:00
Ryan O'Donnell
ad80da3389
Fixes Issue #3400
...
See Issue #3400
2013-12-30 20:58:25 -05:00
Tianon Gravi
fc197188d7
Fix install failure when busybox can't be downloaded
...
Whether or not the "busybox" image downloads and runs properly at the end of the build, we don't want to have the script return a failing exit code, especially since at that point, Docker is successfully installed, and we're just tooting our own horn for good measure.
2013-12-30 08:38:43 -07:00
Tianon Gravi
cda146547e
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
...
Fixes #3372
2013-12-28 06:35:00 -07:00
Tianon Gravi
4100e9b7df
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
2013-12-23 23:55:06 -07:00
Tianon Gravi
5875953d9b
Merge pull request #3112 from shawnl/master
...
hack/PACKAGERS.md: libdevmapper
2013-12-23 19:24:36 -08:00
Sven Dowideit
83d81758b0
use the Makefile - it makes life so much simpler
2013-12-23 23:46:52 +10:00
Guillaume J. Charmes
636dfc82b0
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
2013-12-19 14:31:41 -08:00
Josh Poimboeuf
d215724ad6
add gosqlite to vendor.sh
...
Add gosqlite and its latest revision to vendor.sh so that the vendor
directory can be reliably recreated.
2013-12-19 13:51:46 -06:00
Tianon Gravi
62a81370ff
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
2013-12-19 11:33:49 -07:00
Tianon Gravi
fbac812540
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.
2013-12-18 11:32:25 -07:00
Michael Crosby
be0beb897a
Merge pull request #3238 from tianon/go-build-a
...
Readd go build -a
2013-12-17 20:40:36 -08:00
Guillaume J. Charmes
5204feeaa9
Merge pull request #3237 from tianon/hack-fix-cover-detection
...
Fix "go tool cover" detection to only add -cover and -coverprofile if we...
2013-12-17 10:09:40 -08:00
Tianon Gravi
5e9b4a23e6
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)
2013-12-16 23:57:54 -07:00
Tianon Gravi
a1c5e276f4
Add "-a" back to our "go build"
2013-12-16 23:50:03 -07:00
Tianon Gravi
eddda577a4
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
2013-12-16 22:54:06 -07:00
Tianon Gravi
2ed1001c57
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.
2013-12-16 22:29:08 -07:00
Tianon Gravi
59dc2876a7
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
2013-12-13 11:59:54 -07:00
Tianon Gravi
23ab0af2ff
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
2013-12-13 10:55:49 -08:00
Victor Vieux
b8a16b3459
Merge pull request #3194 from tianon/tianon-hack-maintainer
...
Make Tianon the hack maintainer
2013-12-13 10:55:07 -08:00
Josh Poimboeuf
b8f1c73705
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.
2013-12-12 13:47:24 -06:00
Tianon Gravi
0db1c60542
Make Tianon the hack maintainer
2013-12-12 11:25:30 -07:00
Tianon Gravi
f0879a1e14
Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
2013-12-08 18:43:24 -07:00
Tianon Gravi
ca405786f4
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
2013-12-08 18:40:05 -07:00
Shawn Landden
f379f667a2
hack/PACKAGERS.md: libdevmapper
2013-12-08 14:39:06 -08:00
Tianon Gravi
45cea94a82
Unify hack/make/*test further by invoking hack/make/test directly from dyntest
2013-12-08 15:34:08 -07:00
Tianon Gravi
bac3a8e6f5
Add much better pruning of non-tested directories, including pruning the integration tests directory (doing more with "find" and nothing with "grep")
2013-12-08 13:50:48 -07:00
Tianon Gravi
dcfc4ada4d
Clean output and simplify hack/make/*test by adding go_test_dir function in make.sh
2013-12-08 13:49:57 -07:00
Tianon Gravi
416b16e1e2
Simplify and resync hack/make/test and hack/make/dyntest output handling
2013-12-08 12:57:11 -07:00
Solomon Hykes
edace08327
Hack: stats.sh prints useful project stats for maintainers
2013-12-08 01:47:03 +00:00
Tianon Gravi
aea7418d8a
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b
.
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.
2013-12-05 19:03:47 -07:00
Victor Vieux
c764fb0c29
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
2013-12-05 16:41:01 -08:00
Victor Vieux
35e80868ad
Merge pull request #3004 from tianon/shebang-bash
...
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-05 16:04:09 -08:00
Michael Crosby
dc9f8bf072
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
2013-12-04 11:06:13 -08:00
Tianon Gravi
c81bb20f5b
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
2013-12-02 16:02:54 -07:00
Guillaume J. Charmes
829b118dd8
Add some color in order to emphasis the test FAILURE
2013-12-02 14:54:01 -08:00
Tianon Gravi
3ac76cfeff
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-02 15:48:39 -07:00
Guillaume J. Charmes
0017c68f4a
Remove trailing whitespace
2013-12-02 13:52:27 -08:00
Tianon Gravi
c30e2dc28c
Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS)
2013-12-01 21:20:35 -07:00
Tianon Gravi
5c5f670901
Update to Go 1.2 officially, now that it is released
2013-12-01 15:11:10 -07:00
Victor Vieux
668d22be54
Merge pull request #2808 from tianon/run-all-tests
...
Update test scripts to always run ALL tests, even when some fail
2013-11-28 16:58:31 -08:00
Guillaume J. Charmes
89454851d1
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
2013-11-27 10:04:55 -08:00
Solomon Hykes
8bd6127ab3
Merge pull request #2815 from tianon/hack-make-tgz
...
Add tgz bundlescript
2013-11-25 21:29:14 -08:00
Tianon Gravi
37e0083169
Add a few more small RELEASE-CHECKLIST tweaks, fixes, and improvements
2013-11-22 11:46:15 -07:00
Tianon Gravi
b3f5973f41
Add new tgz bundlescript to default make and release
2013-11-21 22:34:54 -07:00
Tianon Gravi
3314e005f3
Add new bundlescript to build a tgz
2013-11-21 22:34:54 -07:00
Victor Vieux
58f8503b73
update release checklist
2013-11-21 18:34:23 -08:00
Tianon Gravi
f1e6dce047
Update test scripts to always run ALL tests, even when some fail
2013-11-21 16:19:19 -07:00
Tianon Gravi
efd0e13ca7
Add support for compiling using make.sh without '.git' (ie, from a Github tarball, for example)
2013-11-21 15:11:17 -07:00
Johan Euphrosine
b3bee7e0c4
utils: remove dotcloud/tar dep
2013-11-20 18:45:12 +00:00
inglesp
87b4bb9fcc
Typo in ROADMAP.md
2013-11-13 12:32:49 +00:00
Solomon Hykes
3885ef585b
Merge pull request #2612 from tianon/release-script-tweaks
...
* Hack: release script tweaks
2013-11-12 15:04:26 -08:00
Tianon Gravi
5cdb3aec50
Add clarification of multiple "go test" calls in hack/make/*test
2013-11-12 11:23:06 -07:00
Tianon Gravi
7f1b179c67
Fix the display of get.docker.io in Firefox by making our index files text/plain
2013-11-09 02:28:04 -07:00
Tianon Gravi
498b6031b1
Update ubuntu packaging script, especially to stop docker group deletion
2013-11-08 17:23:37 -07:00
Tianon Gravi
f56945d71b
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)
2013-11-08 15:45:18 -07:00
Tianon Gravi
b8e7ec1b74
Update release script with proper support for non-*.docker.io bucket URLs
2013-11-08 15:44:52 -07:00
Daniel Mizyrycki
249f76bebd
docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD.
2013-11-06 20:05:26 -08:00
Daniel Mizyrycki
e7df38dbd0
docker-ci 0.40. Migrate docker-ci to Digital Ocean.
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
efb4c800a7
docker-ci 0.37. Patch hack/dind with latest code for docker-test.
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
0cbeda7391
docker-ci 0.36. Patch hack/dind with latest code for nightly release to work.
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
1717227636
docker-ci 0.35. Push docker coverage and testing into docker-ci production. Update docker nightlyrelease
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
50dd9791f7
testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
2013-11-06 19:13:58 -08:00
Jérôme Petazzoni
31638ab2ad
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
Michael Crosby
e37a7d4981
Merge pull request #2305 from mzdaniel/1800-testing-dind
...
Testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
2013-10-31 09:42:19 -07:00
Victor Vieux
9420e8def7
update RELEASE-CHECKLIST.md to reflect new changes
2013-10-29 15:34:33 -07:00
Tianon Gravi
ff147707b2
Clarify Go 1.2rc2 / Go 1.1.2 requirements in hack/PACKAGERS.md
2013-10-29 13:41:26 -06:00
Tianon Gravi
b283900764
Add SQLite dep to hack/PACKAGERS.md and clean up a few other tiny inconsistencies
2013-10-28 21:57:20 -06:00
Tianon Gravi
640682d56c
Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS
2013-10-25 15:13:25 -07:00
Solomon Hykes
0c9b319dd0
Hack: fix test and dyntest to correctly use $TESTFLAGS
2013-10-25 15:13:25 -07:00
Tianon Gravi
21161dbd51
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.
2013-10-25 15:13:25 -07:00
Tianon Gravi
d789750851
Refactor the handling of static-related build flags
...
This is as discussed with @shykes on IRC
2013-10-25 15:13:25 -07:00
Tianon Gravi
fb8d488896
Add a few small consistency tweaks in hack
2013-10-25 15:13:25 -07:00
Michael Crosby
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Jérôme Petazzoni
279791bc74
Merge pull request #2378 from tianon/linkify-github-ids
...
Linkify @github references in the infrastructure README.md
2013-10-25 11:30:25 -07:00