22152ccc47
cli integration: fix wait race
...
The wait at the end of cli integration script could end up failing if
the process had already exited. This was making it look like the tests
have failed.
This change fixes the problem.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-04-04 19:06:55 +03:00
62b08f557d
cli integration: allow driver selection via vars
...
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-04-04 19:03:07 +03:00
919fe7a3a1
Remove the old Travis-specific files that are no longer necessary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-04 00:46:47 -06:00
81370b5b0f
Add new validate-dco and validate-gofmt bundlescripts for DCO and gofmt validation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-04 00:41:33 -06:00
506055d973
Merge pull request #4853 from pjz/bash_completion
...
Include completion scripts in ubuntu/debian package
2014-04-02 01:40:24 -06:00
f7ae3a1381
integration-cli: pull busybox before running
...
Make sure the busybox image is ready to be used when running the cli
integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-31 22:07:23 +03:00
2543912e7b
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-31 11:55:55 -06:00
3fb1fc0b7b
Small tweaks to the hack scripts to make them simpler
...
Please do with this as you please (including rebasing and/or squashing it), especially under clause (c) of the DCO.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-29 23:09:45 +02:00
6db32fdefd
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-29 23:09:40 +02:00
d4725801b3
Vendor github.com/godbus/dbus and github.com/coreos/go-systemd
...
We need this to do systemd API calls.
We also add the static_build tag to make godbus not use
os/user which is problematic for static builds.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-27 22:44:26 +01:00
be5c65c2a2
Merge pull request #4613 from tianon/add-cgroupfs-mention-to-packagers
...
Add mention of mounting cgroupfs properly to PACKAGERS.md
2014-03-27 13:26:31 -06:00
4c43566925
This patch adds SELinux labeling support.
...
docker will run the process(es) within the container with an SELinux label and will label
all of the content within the container with mount label. Any temporary file systems
created within the container need to be mounted with the same mount label.
The user can override the process label by specifying
-Z With a string of space separated options.
-Z "user=unconfined_u role=unconfined_r type=unconfined_t level=s0"
Would cause the process label to run with unconfined_u:unconfined_r:unconfined_t:s0"
By default the processes will run execute within the container as svirt_lxc_net_t.
All of the content in the container as svirt_sandbox_file_t.
The process mcs level is based of the PID of the docker process that is creating the container.
If you run the container in --priv mode, the labeling will be disabled.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-03-26 15:30:40 -04:00
4746c76156
Include contributed completions in ubuntu PPA
...
Docker-DCO-1.1-Signed-off-by: Paul Jimenez <pj@place.org> (github: pjz)
2014-03-26 11:23:26 -04:00
576278102e
install.sh (get.docker.io) aufs comment updated.
...
devicemapper has landed, but the TODO hasn't been actioned presumably
because aufs is still preferred over devicemapper when available[1].
Comment updated accordingly.
Citation [1]: 267ca39921/runtime/graphdriver/driver.go (L40-L46)
2014-03-25 11:33:16 -07:00
f41135bc11
As far as I know this code is not used or maintained
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-24 12:39:56 +00:00
708ecd7da2
Add mention of mounting cgroupfs properly to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-21 14:17:09 -06:00
6b46a09186
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-19 22:25:09 -06:00
372b7282cb
Merge pull request #4788 from SvenDowideit/sign-releases-fixup
...
Fix bugs in release.sh
2014-03-19 18:19:25 -06:00
62eb23aed5
missed a bug
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-20 10:18:08 +10:00
43124b5613
Merge pull request #4708 from SvenDowideit/sign-releases
...
Add md5 and sha256 to binaries on get.docker.io
2014-03-19 17:38:07 -06:00
43febdd432
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-03-20 09:35:58 +10:00
179e2c92d8
Generate md5 and sha265 hashes when building, and upload them in hack/release.sh
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-03-20 09:19:47 +10:00
4fd82db4be
refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740
...
In #4740 , the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.
Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com> (github: vojnovski)
2014-03-19 10:20:10 +01:00
c76def2dd2
typo
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-18 13:46:38 -04:00
29c45e7f4f
packagers: btrfs build tag docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-18 13:45:36 -04:00
448b64164d
runtime: no build tags for vfs driver
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-17 21:54:43 -04:00
670ce98c60
graphdriver: build tags
...
Enable build tags for all the graphdrivers to be excludable.
As an example:
```
$ go build
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 18400158 Mar 14 14:22 docker*
$ go build -tags "exclude_graphdriver_aufs exclude_graphdriver_vfs exclude_graphdriver_devicemapper"
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 17467068 Mar 14 14:22 docker*
```
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-17 21:54:05 -04:00
212a870734
Merge pull request #4646 from tianon/double-dash
...
Update to double-dash everywhere
2014-03-13 15:31:14 -07:00
6fc83eefd9
add a breakathon for testing
...
Docker-DCO-1.1-Signed-off-by: Charlie Lewis <charliel@lab41.org> (github: cglewis)
2014-03-13 12:39:24 -07:00
44fe8cbbd1
Update to double-dash everywhere
...
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-13 11:46:02 -06:00
99b6364790
Exclude more "definitely not unit tested Go source code" directories from hack/make/test
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-12 01:18:12 -06:00
e1c48fa560
Clean up the "go test" output from "make test" to be much more readable/scannable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-12 01:17:38 -06:00
7b79f597f6
Merge pull request #4521 from tianon/release-checklist-origin
...
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
2014-03-11 14:34:47 -06:00
ce09171780
Merge pull request #4520 from tianon/clarify-docs-branch-update
...
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
2014-03-10 18:47:31 -06:00
3c25302a0b
Update vendor.sh with new kr/pty revision
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-03-10 15:34:38 -07:00
50082f792b
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-10 03:27:46 -06:00
661cf32e4f
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 23:29:08 -07:00
0a819380c5
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 23:16:26 -07:00
a40bb2aabc
Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 21:22:25 -07:00
be344cf0d8
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 19:55:22 -07:00
0b23393ba1
Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-06 13:39:17 -07:00
c89fa6645e
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-03-06 12:05:03 -08:00
fb314c266b
Merge pull request #4129 from proppy/patch-2
...
hack/RELEASE: add step for updating doc branch
2014-03-05 16:08:37 -08:00
c41e51ce3d
Add further clarification of where/when the build-time deps are applicable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-05 08:20:42 -07:00
5317ad476d
Add "git" to our Ubuntu package "Recommends" (whoops, this should've been in here for a while now)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:59:46 -07:00
b69f632830
Update package deps to remove LXC and move aufs-tools to be in "Recommends" instead of strict Depends
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:52:39 -07:00
615667b883
Rewrite more loads of PACKAGERS.md to hopefully remove some outdated information, add some updated information and pointers, and generally make the tone of this document less condescending :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 22:51:34 -07:00
d9ec3a0347
Mention in PACKAGERS.md that Tianon is available for packager needs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 21:41:59 -07:00
9a677e6a68
Reflow PACKAGERS.md to 80 columns (where possible) and update some minor formatting
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 21:40:42 -07:00
a7f265223a
Update PACKAGERS.md with some text changes, including and especially moving "LXC" to a new "Optional Dependencies" section
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-04 21:25:00 -07:00
b187d7ae41
Added documentation (and some cleanup) around small patch exemptions
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-03-02 11:43:18 -05:00
24ff3a3dc3
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-02-24 21:59:01 +00:00
41b1f93bf7
Add simple "grep" to hide the harmless "warning: no packages being tested depend on ..." in "go test -coverpkg ..." output
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-21 11:26:04 -07:00
b3d5e9527a
Package coverage when running integration tests
...
If coverpkg is missing on `go test` command, only the current package
will be covered. That's the case of unit tests. For integration tests
we need to explicitly declare each package.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-02-19 16:59:51 +00:00
277262d9c7
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
2014-02-18 11:50:16 -07:00
6d1c0a91f8
Add "Conflicts" to our lxc-docker package to make it more clear that we can't/shouldn't be installed alongside either "docker" or "docker.io"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-18 11:24:33 -07:00
6ccb30a0e5
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-18 11:23:37 -07:00
f3ff190491
Merge pull request #4131 from tianon/vendor-golang-xattrs
...
Add vendored archive/tar that includes xattrs patch
2014-02-17 21:12:28 +02:00
b7db2d5f80
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
2014-02-17 10:52:39 -08:00
b762d3a739
Add vendored archive/tar that includes xattrs patch
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-17 08:20:21 -07:00
da3a52746b
hack/RELEASE: add step for updating doc branch
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: google)
2014-02-13 12:01:55 -08:00
c7840f522c
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)
2014-02-13 10:27:45 -07:00
f794fbc230
Merge pull request #4043 from tianon/hack-git-detection-and-use
...
Add better ".git" detection and use
2014-02-13 09:56:14 -07:00
7ea725fdc5
Fix the one spot I missed dockerversion
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-02-11 18:23:17 -07:00
da04f49b38
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)
2014-02-11 17:26:54 -07:00
ae3c7dec3b
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)
2014-02-11 16:10:51 -08:00
0a0406450f
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)
2014-02-10 13:48:43 -07:00
d3d85d38fb
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)
2014-02-09 18:21:01 -07:00
25d87553f6
docker-ci: Add new docker coverage report
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
2014-02-06 11:59:29 -08:00
bac7e741bf
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)
2014-02-04 13:34:24 -07:00
df4682907d
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-02-04 15:32:19 +10:00
fb796900fb
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)
2014-02-03 09:41:11 -08:00
7ffd2b0785
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)
2014-02-02 22:47:42 -07:00
6922f1be08
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)
2014-02-01 23:23:33 -07:00
523341d994
Merge pull request #3857 from creack/remove_darwin_files
...
Remove all darwin specific files and use more generic _unsupported with build tags.
2014-01-31 11:48:10 -08:00
065dd231dd
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)
2014-01-31 03:16:42 -07:00
b4604ae7cf
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
2014-01-31 00:56:30 -08:00
56317c74f7
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
2014-01-31 00:54:44 -08:00
c8d1596902
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)
2014-01-30 12:27:45 -07:00
6cfe778c2c
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)
2014-01-29 00:10:39 -07:00
bbfc531b51
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
2014-01-27 12:09:03 -08:00
b994c13159
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)
2014-01-26 13:24:03 -07:00
639d2ecd4f
Merge pull request #3682 from alexlarsson/implement-tar
...
Implement tar in Go
2014-01-22 11:23:47 -08:00
7c55cbd4c9
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)
2014-01-22 21:31:42 +10:00
572002a715
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
...
Update bash shebangs to use "/usr/bin/env bash" for increased portability
2014-01-21 17:30:52 -08:00
b1953baba2
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)
2014-01-22 02:21:56 +01:00
a37ffa4041
Merge pull request #3662 from tianon/add-udev-to-deb
...
Add udev rules file to our generated deb package
2014-01-20 19:44:05 -08:00
8a4824d1ad
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)
2014-01-20 20:35:16 +01:00
595b8f2986
Add udev rules file to our generated deb package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-19 17:27:43 -07:00
980e0bf52c
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)
2014-01-18 10:41:37 -07:00
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
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
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
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
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
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
07f62f199f
Merge pull request #3554 from tianon/ubuntu-dep
...
Add ca-certificates to our package Recommends
2014-01-11 15:07:50 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
2a1181f404
Spelling error.
2014-01-04 23:15:15 -05:00
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
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
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
ad80da3389
Fixes Issue #3400
...
See Issue #3400
2013-12-30 20:58:25 -05:00
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
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
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
5875953d9b
Merge pull request #3112 from shawnl/master
...
hack/PACKAGERS.md: libdevmapper
2013-12-23 19:24:36 -08:00
83d81758b0
use the Makefile - it makes life so much simpler
2013-12-23 23:46:52 +10:00
636dfc82b0
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
2013-12-19 14:31:41 -08:00
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
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
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
be0beb897a
Merge pull request #3238 from tianon/go-build-a
...
Readd go build -a
2013-12-17 20:40:36 -08:00
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
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
a1c5e276f4
Add "-a" back to our "go build"
2013-12-16 23:50:03 -07:00
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
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
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
23ab0af2ff
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
2013-12-13 10:55:49 -08:00
b8a16b3459
Merge pull request #3194 from tianon/tianon-hack-maintainer
...
Make Tianon the hack maintainer
2013-12-13 10:55:07 -08:00
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
0db1c60542
Make Tianon the hack maintainer
2013-12-12 11:25:30 -07:00
f0879a1e14
Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
2013-12-08 18:43:24 -07:00
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
f379f667a2
hack/PACKAGERS.md: libdevmapper
2013-12-08 14:39:06 -08:00
45cea94a82
Unify hack/make/*test further by invoking hack/make/test directly from dyntest
2013-12-08 15:34:08 -07:00
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
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
416b16e1e2
Simplify and resync hack/make/test and hack/make/dyntest output handling
2013-12-08 12:57:11 -07:00
edace08327
Hack: stats.sh prints useful project stats for maintainers
2013-12-08 01:47:03 +00:00
aea7418d8a
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b
2013-12-05 19:03:47 -07:00
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
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
dc9f8bf072
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
2013-12-04 11:06:13 -08:00
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
829b118dd8
Add some color in order to emphasis the test FAILURE
2013-12-02 14:54:01 -08:00
3ac76cfeff
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-02 15:48:39 -07:00
0017c68f4a
Remove trailing whitespace
2013-12-02 13:52:27 -08:00
c30e2dc28c
Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS)
2013-12-01 21:20:35 -07:00
5c5f670901
Update to Go 1.2 officially, now that it is released
2013-12-01 15:11:10 -07:00
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
89454851d1
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
2013-11-27 10:04:55 -08:00
8bd6127ab3
Merge pull request #2815 from tianon/hack-make-tgz
...
Add tgz bundlescript
2013-11-25 21:29:14 -08:00
37e0083169
Add a few more small RELEASE-CHECKLIST tweaks, fixes, and improvements
2013-11-22 11:46:15 -07:00
b3f5973f41
Add new tgz bundlescript to default make and release
2013-11-21 22:34:54 -07:00
3314e005f3
Add new bundlescript to build a tgz
2013-11-21 22:34:54 -07:00
58f8503b73
update release checklist
2013-11-21 18:34:23 -08:00
f1e6dce047
Update test scripts to always run ALL tests, even when some fail
2013-11-21 16:19:19 -07:00
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
b3bee7e0c4
utils: remove dotcloud/tar dep
2013-11-20 18:45:12 +00:00
87b4bb9fcc
Typo in ROADMAP.md
2013-11-13 12:32:49 +00:00
3885ef585b
Merge pull request #2612 from tianon/release-script-tweaks
...
* Hack: release script tweaks
2013-11-12 15:04:26 -08:00
5cdb3aec50
Add clarification of multiple "go test" calls in hack/make/*test
2013-11-12 11:23:06 -07:00
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
498b6031b1
Update ubuntu packaging script, especially to stop docker group deletion
2013-11-08 17:23:37 -07:00
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
b8e7ec1b74
Update release script with proper support for non-*.docker.io bucket URLs
2013-11-08 15:44:52 -07:00
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
e7df38dbd0
docker-ci 0.40. Migrate docker-ci to Digital Ocean.
2013-11-06 19:13:58 -08:00
efb4c800a7
docker-ci 0.37. Patch hack/dind with latest code for docker-test.
2013-11-06 19:13:58 -08:00
0cbeda7391
docker-ci 0.36. Patch hack/dind with latest code for nightly release to work.
2013-11-06 19:13:58 -08:00
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
50dd9791f7
testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
2013-11-06 19:13:58 -08:00
31638ab2ad
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
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
9420e8def7
update RELEASE-CHECKLIST.md to reflect new changes
2013-10-29 15:34:33 -07:00
ff147707b2
Clarify Go 1.2rc2 / Go 1.1.2 requirements in hack/PACKAGERS.md
2013-10-29 13:41:26 -06:00
b283900764
Add SQLite dep to hack/PACKAGERS.md and clean up a few other tiny inconsistencies
2013-10-28 21:57:20 -06:00
640682d56c
Fix "go test -i" to include the proper LDFLAGS and BUILDFLAGS
2013-10-25 15:13:25 -07:00
0c9b319dd0
Hack: fix test and dyntest to correctly use $TESTFLAGS
2013-10-25 15:13:25 -07:00
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
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
fb8d488896
Add a few small consistency tweaks in hack
2013-10-25 15:13:25 -07:00
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
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
98c94dd4db
Merge pull request #2364 from tianon/sudo-modprobe
...
Fix install.sh with $sh_c to get sudo/su for modprobe
2013-10-24 11:24:23 -07:00
c9375d14fc
Linkify @github references in the infrastructure README.md
2013-10-24 11:54:06 -06:00
f0dbdba5c0
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
2013-10-23 15:31:16 -07:00
0324e567ad
Fix install.sh with $sh_c to get sudo/su for modprobe
2013-10-23 15:48:30 -06:00
ef5cf6c1ec
Merge pull request #2226 from tianon/init
...
Add initial init scripts library and better/safer Ubuntu packaging that works for Debian, too
2013-10-23 14:29:41 -07:00
2aaaf90320
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
2013-10-23 07:38:12 -06:00
3b0cbc59ea
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)
2013-10-19 23:56:14 -06:00
95f3f77fc4
testing infrastructure, issue #1800 : Refactor docker testing using Docker in Docker
2013-10-18 22:33:16 -07:00
85956c70b5
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.
2013-10-17 23:20:18 -07:00
8c38c30985
Remove spurious messages, and use proper args expansion.
...
Also, display some (hopefully helpful) message when no command was given.
2013-10-17 23:19:36 -07:00
unclejack
Tianon Gravi
Alexander Larsson
Dan Walsh
Paul Jimenez
Paul Annesley
Michael Crosby
Sven Dowideit
Sven Dowideit
Viktor Vojnovski
Vincent Batts
Vincent Batts
Victor Vieux
Charlie Lewis
Guillaume J. Charmes
Guillaume J. Charmes
Andy Rothfusz
James Turnbull
Fabio Falci
unclejack
Daniel Mizyrycki
Johan Euphrosine
Solomon Hykes
Kim BKC Carlbacker
Jordan Sissel
Evan Krall
zimbatm
sudosurootdev
Ryan O'Donnell
Guillaume J. Charmes
Josh Poimboeuf
Michael Crosby
Victor Vieux
Shawn Landden
Guillaume J. Charmes
Guillaume J. Charmes
Solomon Hykes
Victor Vieux
inglesp
Jérôme Petazzoni
Victor Vieux
Jérôme Petazzoni