Commit Graph

225 Commits

Author SHA1 Message Date
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
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
8d4b73a932 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)
Upstream-commit: 561d1db074edd4e7e7d8b02401abd3fc11b9d51c
Component: engine
2014-01-07 08:25:54 -07:00
4e140a2de4 Spelling error.
Upstream-commit: 2a1181f404387f6d530a86a6196b40a6dd541c20
Component: engine
2014-01-04 23:15:15 -05:00
92d3a8ac6c 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.
Upstream-commit: 7fd6dcc831d28cc1ca1a5d56c9043354228f087d
Component: engine
2014-01-01 22:34:22 -07:00
b5783c4b92 Merge pull request #3374 from tianon/fpm-license-vendor
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
Upstream-commit: 5f557842246eb1d83b94732754760e87416386cb
Component: engine
2014-01-01 14:42:47 -08:00
7494334ffd Merge pull request #3392 from tianon/fix-install-failure
Fix install failure when busybox can't be downloaded
Upstream-commit: 40522c038053cf90f4035fb52a57003fd8ecf25c
Component: engine
2013-12-30 20:04:30 -08:00
93593cd471 Fixes Issue #3400
See Issue #3400
Upstream-commit: ad80da33895aa9f2200279282acc25e4b2bcbf27
Component: engine
2013-12-30 20:58:25 -05:00
06c747c212 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.
Upstream-commit: fc197188d7f4098b6035d0e13031431871a2dc95
Component: engine
2013-12-30 08:38:43 -07:00
af79735338 Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
Fixes #3372
Upstream-commit: cda146547e59ff875b3eb6202a87004a3f7ea96d
Component: engine
2013-12-28 06:35:00 -07:00
7db2296200 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
Upstream-commit: 4100e9b7df5cbce855b47b3625d34c9667e40dc1
Component: engine
2013-12-23 23:55:06 -07:00
cc04ab4930 Merge pull request #3112 from shawnl/master
hack/PACKAGERS.md: libdevmapper
Upstream-commit: 5875953d9be0bf3339185dd6b5c4b1e185eb85b6
Component: engine
2013-12-23 19:24:36 -08:00
9526d02fc2 use the Makefile - it makes life so much simpler
Upstream-commit: 83d81758b0ca7de9ca38f4ea3a7eaaa8a0c275ad
Component: engine
2013-12-23 23:46:52 +10:00
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