Commit Graph

247 Commits

Author SHA1 Message Date
173cbcacdb Add shasum fallback to hack/make/dynbinary for Darwin (where sha1sum is not available)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c7840f522c37d2c964e442c5acac745f702b8801
Component: engine
2014-02-13 10:27:45 -07:00
1e6f0f8de2 Merge pull request #4043 from tianon/hack-git-detection-and-use
Add better ".git" detection and use
Upstream-commit: f794fbc2306e633916b7f000d441d234e198fc24
Component: engine
2014-02-13 09:56:14 -07:00
2b6a0d82a2 Fix the one spot I missed dockerversion
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7ea725fdc530e989516fae60f5dafecb139d75b8
Component: engine
2014-02-11 18:23:17 -07:00
9ed97b673b Move even more stuff into dockerversion
Also, use it in all the places. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: da04f49b383c02ee28c32f948048b9e9a402bb4f
Component: engine
2014-02-11 17:26:54 -07:00
ef486c6630 Move docker version introspection to a sub-package.
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ae3c7dec3b075a263da8d1e1cc510275b281e799
Component: engine
2014-02-11 16:10:51 -08:00
f694361fe5 Add better ".git" detection and use
This way, packagers can set GIT_DIR appropriately if they'd prefer to not have ".git" inside their working directory.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0a0406450fb83f4ff7d08235cd3e94ea8fba752f
Component: engine
2014-02-10 13:48:43 -07:00
aa80369d9a Add slightly better GOPATH detection/handling
This also adds a new "AUTO_GOPATH" environment variable that will create an appropriate GOPATH as part of the build process.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d3d85d38fb5bdd0327fdc9fe8b637cb0f4e1dcf2
Component: engine
2014-02-09 18:21:01 -07:00
20c26b1bdf docker-ci: Add new docker coverage report
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
Upstream-commit: 25d87553f678e247b3036db7804599624191dfd1
Component: engine
2014-02-06 11:59:29 -08:00
8fbcfcf011 Update RELEASE-CHECKLIST to mention how to get a decent contributors list
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bac7e741bfd1d77ebb742bc1ed3fec6c6f300be3
Component: engine
2014-02-04 13:34:24 -07:00
b5a2f94fbf i was reading, and it sprang out at me :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: df4682907ddc41084bf193b863ff9da796b8e102
Component: engine
2014-02-04 15:32:19 +10:00
67cb10e065 Merge pull request #3892 from tianon/remove-btrfs-header-reference
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
Upstream-commit: fb796900fbcd11ae63e918f91b226463619bb152
Component: engine
2014-02-03 09:41:11 -08:00
f2667b61da Update PACKAGERS.md to explicitly talk about stripping, quoting Dave Cheney from Golang upstream (who is very, very adamant about not stripping Golang compiled binaries)
While there, remove the now-outdated section about `CGO_ENABLED=0`

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7ffd2b0785529b0b71bec90c8468dc3cb4b37525
Component: engine
2014-02-02 22:47:42 -07:00
6732035ba0 Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6922f1be08111d889b0585b763b08f92d7a55e05
Component: engine
2014-02-01 23:23:33 -07:00
df82456ed9 Merge pull request #3857 from creack/remove_darwin_files
Remove all darwin specific files and use more generic _unsupported with build tags.
Upstream-commit: 523341d994265b9f72e4869f0fd094fd15f1b480
Component: engine
2014-01-31 11:48:10 -08:00
e8f6d5eb59 Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 065dd231dd7d7858df982a8decfade9df936cf63
Component: engine
2014-01-31 03:16:42 -07:00
05ceb6e730 Merge pull request #3822 from tianon/install-your-user
Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
Upstream-commit: b4604ae7cf84bb45c7ba604c4ac875a29722287e
Component: engine
2014-01-31 00:56:30 -08:00
71cac1ed88 Merge pull request #3760 from tianon/better-nondocker-warning
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
Upstream-commit: 56317c74f72d7f02c9a2c7d2c8d5b2d388265d70
Component: engine
2014-01-31 00:54:44 -08:00
f121a9a07b Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c8d1596902704076c8d85a30e80f90f8efb3e175
Component: engine
2014-01-30 12:27:45 -07:00
e43c065db4 Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
As a bonus, if the user has run this script the way we recommend (ie, without "sudo" or "su", run as their user), we can actually give them the exact command they'll need with their correct username substituted appropriately.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6cfe778c2cb6359b47cf646dc12824b58cc8d887
Component: engine
2014-01-29 00:10:39 -07:00
254ce5fef5 Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
move the contributing hook into contrib, and use curl in the same way as the gofmt above
Upstream-commit: bbfc531b51cb17e97022ff0e904f91faac48713f
Component: engine
2014-01-27 12:09:03 -08:00
d51ad14ef1 Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b994c1315997945815e7b927b8493595b194d016
Component: engine
2014-01-26 13:24:03 -07:00
78636fd4dc Merge pull request #3682 from alexlarsson/implement-tar
Implement tar in Go
Upstream-commit: 639d2ecd4f7a86a34bdde890002129f0b22c85fa
Component: engine
2014-01-22 11:23:47 -08:00
6e009b9cf4 move the contributing hook into hack, and use curl in the same way as the gofmt above
and remove the fmt-check one we don't document

tianon tells me they're called GitHub, not Github :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7c55cbd4c9da88ffb4b1a325ba2e5435e337a3af
Component: engine
2014-01-22 21:31:42 +10:00
df0756600a Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
Update bash shebangs to use "/usr/bin/env bash" for increased portability
Upstream-commit: 572002a71593009bd4dd3285ac429b70042b6ce6
Component: engine
2014-01-21 17:30:52 -08:00
923913cbf1 This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com> (github: bkcsoft)
Upstream-commit: b1953baba28362c928d962f0729325d3293c4753
Component: engine
2014-01-22 02:21:56 +01:00
8056a9e2e7 Merge pull request #3662 from tianon/add-udev-to-deb
Add udev rules file to our generated deb package
Upstream-commit: a37ffa4041cb8504741ab2805d16f8b268772793
Component: engine
2014-01-20 19:44:05 -08:00
e14eb95c77 hack: Remove GNU Tar requirement
We no longer call out to tar, so this is not needed.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 8a4824d1ad2fafd158fbaad52a658c5fd3f7de30
Component: engine
2014-01-20 20:35:16 +01:00
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
068067c588 Fix Travis for PRs against non-master (like release, for example)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 980e0bf52c15bdf179c58b2d4f1085e26f8a3e2a
Component: engine
2014-01-18 10:41:37 -07:00
282dfddd17 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/'
Upstream-commit: 59fe36623bae670f2b973a8e558e57b69197b5d9
Component: engine
2014-01-16 16:54:39 -08:00
8f3a13dc70 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)
Upstream-commit: 40b40cffb13758c03eff2cf05b1e5b0aa47bdb9d
Component: engine
2014-01-15 22:20:51 -07:00
51d6ec0743 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)
Upstream-commit: 221454f315a8993a6996ba9867f98bddbdb1eb16
Component: engine
2014-01-14 19:29:02 -07:00
6a213b9da5 Merge pull request #3581 from tianon/deb-xz-utils
Add xz-utils to our deb-recommends since it's necessary for some images
Upstream-commit: bfc256f6c99461d2051bebc611bb06287b58a867
Component: engine
2014-01-14 12:07:10 -08:00
d56dd5badf Fix Travis to not check gofmt on vendor/*
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f700aa15705c418d6523b7ecb7c6e7413deaed13
Component: engine
2014-01-14 11:07:18 -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
bc406dc2fc Merge pull request #3551 from tianon/test-docker-io-gpg-fingerprint
Inline the test.docker.io fingerprint in the install.sh script as well
Upstream-commit: 7273b33e861554315f74e2d4b612f7b6d2c11a3f
Component: engine
2014-01-11 15:07:06 -08:00
283c7cd8b1 Merge pull request #3500 from tianon/lvm2-version
Add more specific lvm2 version to PACKAGERS document
Upstream-commit: f65706aaeba84efa3056f8f349154b2ae31e9132
Component: engine
2014-01-11 03:39:01 -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
ee61e0d71c 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)
Upstream-commit: 051e7a0befaddb6ddbd047abff5f524a7247af6c
Component: engine
2014-01-10 10:20:31 -07:00
398a309d63 Update Travis to check for new 1.1 DCO version
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a4f3cd62a3d221dcb55279cc9f0db41e7920c094
Component: engine
2014-01-09 09:52:17 -07:00
91a5b68120 Merge pull request #3446 from tianon/update-checklist
Update release checklist with more information, more commands, and more ...
Upstream-commit: ee656336205859cd3a935c00a02e47ef18d442cc
Component: engine
2014-01-08 15:37:49 -08:00
cad35f4013 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)
Upstream-commit: 7626e9fd6448cbaa92632f2ce9cab70e9e142d8a
Component: engine
2014-01-08 00:27:50 -07:00
16b13f3182 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)
Upstream-commit: b57051a7247c61fdd9dc06710cd61521dca91940
Component: engine
2014-01-07 18:28:07 -07:00
7f69f81268 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)
Upstream-commit: 94c803e9f0e725e6a52f71ffaa88d05137b62771
Component: engine
2014-01-08 01:08:14 +00:00
b057d9da45 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)
Upstream-commit: 13ebc68636f922e799d71792748934b8883d2f1f
Component: engine
2014-01-08 01:07:04 +00:00
01b84e7dd9 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)
Upstream-commit: 3779291e9b2f939aa98b91b35552bd9b76c9f39a
Component: engine
2014-01-07 15:27:51 -07:00
c43b1c60c8 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)
Upstream-commit: 7c4e5fbd4608bb4b1509552fbe9d3c0bcd7c347a
Component: engine
2014-01-07 13:45:40 -07:00