Commit Graph

7456 Commits

Author SHA1 Message Date
Tianon Gravi 2204a27df0 Merge pull request #5073 from tianon/update-release-bundles
Update RELEASE_BUNDLES to include integration tests
2014-04-08 13:05:00 -06:00
Tianon Gravi cc1328d376 Merge pull request #5076 from tianon/update-hack-make-test-integration-cli
Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
2014-04-08 12:59:08 -06:00
Victor Vieux 29fd62f396 Merge pull request #5083 from shin-/4343-http_401_private_push_error
Added specific error message when hitting 401 over HTTP on push
2014-04-08 11:19:17 -07:00
Guillaume J. Charmes 4f828d67f0
Backup current docker apparmor profile and replace it with the new one
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
2014-04-08 11:09:31 -07:00
Michael Crosby a056a9ca22 Merge pull request #5085 from tianon/more-readable-crossplatforms-list
Update DOCKER_CROSSPLATFORMS to be more readable
2014-04-08 11:08:57 -07:00
unclejack 1bcb9ce69e Merge pull request #5068 from tianon/fix-abs-volume-check
Fix edge case in bind mount absolute path detection
2014-04-08 20:03:52 +03:00
Vincent Batts 0a6d42e208 docker save: fix filemode permissions
currently the files created are not readable. This makes the files and
directories permissions more sane.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-04-08 12:39:25 -04:00
Tianon Gravi cf655ca98d Update DOCKER_CROSSPLATFORMS to be more readable
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-08 09:42:47 -06:00
shin- 8b2bcd9a4b Added specific error message when hitting 401 over HTTP on push
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com> (github: shin-)
2014-04-08 17:07:29 +02:00
almoehi a67f350442 Added reactive-docker to list of remote API clients
Docker-DCO-1.1-Signed-off-by: H. Rapp <webmaster@3kolor.com> (github: almoehi)
2014-04-08 11:47:15 +02:00
Tianon Gravi 4c3eb7db67 Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-07 23:10:40 -06:00
Tianon Gravi 5737c2eb98 Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-07 22:53:42 -06:00
Guillaume J. Charmes 8cfbc44661 Merge pull request #5049 from Supermathie/aa-fix
apparmor: docker-default: Include base abstraction
2014-04-07 21:34:01 -07:00
James Turnbull fdfd4530fc Merge pull request #5074 from SvenDowideit/simplify-builder-headings
use the docs sidebar to be the TOC means that level 2 headings are the most important
2014-04-07 21:28:02 -07:00
Sven Dowideit e6a64af966 use the docs sidebar to be the TOC means that level 2 headings are the most important
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-04-08 14:25:57 +10:00
Tianon Gravi 886eb85dec Update RELEASE_BUNDLES to include integration tests
Previously, running just "hack/release.sh" only ran the unit tests.  This updates that to run the unit tests, then the integration tests, then build the binaries, then run the cli integration tests (so we're literally testing the binary we're about to release, which is super freaking cool IMO <3).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-07 22:22:03 -06:00
Tianon Gravi 7908725e3f Fix a few minor man formatting consistency issues
Some flags ended with a colon, some didn't.  For man pages, the prevailing normal practice is not to end the flags lines with colons.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-07 21:38:30 -06:00
Tianon Gravi ab248675aa Add contrib/man to our generated deb
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-07 21:32:17 -06:00
Tianon Gravi 603088be92 Fix edge case in bind mount absolute path detection
`filepath.Abs` does more than just `filepath.IsAbs` - namely, `filepath.Clean`, which resolves things like `.../.` or `.../../...`, and causes even an absolute path like `/some/path/../absolute` to fail (or, in my case, `/path/to/docker/.`)

Just using `filepath.IsAbs` directly is a much cheaper check, too. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-04-07 21:20:03 -06:00
O.S. Tezer be3a5a2e37 Merge pull request #5029 from ipbabble/manpages
Added man pages for several docker commands.
2014-04-08 05:51:20 +03:00
Guillaume J. Charmes 1d2126be6c Merge pull request #5025 from dstine/readme-fix
fixed two readme typos
2014-04-07 19:31:16 -07:00
Michael Crosby 919dbbe44d Move DNS options to hostconfig
The local resolver warning needed to be moved at daemon start because it
was only show for the first container started anyways before having a
default value set.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 19:12:22 -07:00
Dan Stine 9c4d10b9a9 fixed three more typos 2014-04-07 22:09:15 -04:00
Michael Crosby 6bf7104271 Merge pull request #5064 from crosbymichael/remount-bind-mount
Ensure that ro mounts are remounted
2014-04-07 19:04:25 -07:00
Sven Dowideit 02c5a87b40 Merge pull request #4997 from jpetazzo/apt-should-always-use-https
Use https://get.docker.io/ubuntu consistently
2014-04-08 11:24:07 +10:00
Michael Crosby b6042f252d Ensure that ro mounts are remounted
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 18:23:22 -07:00
William Henry da8231a26b Added man pages for several docker commands.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

	new file:   contrib/man/man1/docker-attach.1
	new file:   contrib/man/man1/docker-build.1
	new file:   contrib/man/man1/docker-images.1
	new file:   contrib/man/man1/docker-info.1
	new file:   contrib/man/man1/docker-inspect.1
	new file:   contrib/man/man1/docker-rm.1
	new file:   contrib/man/man1/docker-rmi.1
	new file:   contrib/man/man1/docker-run.1
	new file:   contrib/man/man1/docker-tag.1
	new file:   contrib/man/man1/docker.1
2014-04-07 19:15:28 -06:00
Sven Dowideit 6e0d8ce8c3 Merge pull request #4715 from sebsto/patch-1
Include instruction for AMI 2014.03
2014-04-08 11:02:54 +10:00
Victor Vieux 8c3eb900de Merge pull request #5058 from crosbymichael/remove-opts
Remove -o cli flag and DriverConfig from HostConfig
2014-04-07 16:45:54 -07:00
Michael Crosby 028d44d126 Remove and unexport selinux functions
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:59:44 -07:00
Michael Crosby 82f37b874e Ensure that selinux is disabled by default
This also includes some portability changes so that the package can be
imported with the top level runtime.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:44:53 -07:00
Michael Crosby aaf018017c Add more label checks for selinux enabled
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:44:53 -07:00
Michael Crosby b1e98e06dc Remove selinux build tag
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:44:52 -07:00
Michael Crosby ffebcb660f Move -o cli flag and DriverConfig from HostConfig
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 14:44:52 -07:00
unclejack d8fc3eecf5 Merge pull request #5010 from shykes/cli-tests
Convert a legacy integration test to a clean v2 CLI integration test.
2014-04-08 00:34:58 +03:00
Solomon Hykes 30f22ee9e3 Convert a legacy integration test to a clean v2 CLI integration test.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-04-07 20:34:21 +00:00
unclejack 902f88ea15 Merge pull request #5057 from crosbymichael/refactor-runtime-create
Refactor runtime create and history
2014-04-07 23:24:46 +03:00
Michael Crosby 1277885420 Clean runtime create and make it simple
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 12:20:23 -07:00
James Turnbull 7fddec4a65 Merge pull request #4764 from SvenDowideit/use-docker-tgz
Use docker tgz file to download on OSX
2014-04-07 11:54:27 -07:00
Jérôme Petazzoni dc7fefc16b Use https://get.docker.io/ubuntu consistently
The install script (on https://get.docker.io/) installs an APT sources.list
entry referencing an HTTPS repository, and takes care of installing the
apt-transport-https package. However, the Debian/Ubuntu specific installation
script (on https://get.docker.io/ubuntu) used an HTTPS repository but without
installing that package, causing the installation to fail on some platforms.

This will use HTTPS everywhere, and updates the documentation accordingly.

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
2014-04-07 11:32:12 -07:00
Michael Crosby c987aa09d8 Move history to separate file
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-04-07 11:01:35 -07:00
Victor Vieux 2fde8dfb83 Merge pull request #5040 from crosbymichael/remove-context-from-config
Remove context from config
2014-04-07 10:48:15 -07:00
Victor Vieux 73a22fc6b3 Merge pull request #5039 from kzys/freebsd-timestamp
Don't assume the file system has sub-second precision timestamp
2014-04-07 10:28:22 -07:00
unclejack 2f292a97de Merge pull request #5038 from kzys/remove-archive-stat
Remove archive/stat_unsupported.go because it is not used
2014-04-07 19:50:31 +03:00
unclejack 1a3eb4967b Merge pull request #5051 from SvenDowideit/build-rm-help
intermediate image layers are used for more than the build
2014-04-07 18:59:41 +03:00
Sven Dowideit 87ea27e80b intermediate image layers are used for more than the build
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-04-07 18:37:52 +10:00
Michael Brown 726206f2aa apparmor: pull in variables from tunables/global
The variables that were defined at the top of the apparmor profile are best
pulled in via the <tunables/global> include.

Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org> (github: Supermathie)
2014-04-07 03:04:27 -04:00
Michael Brown 320b3e0d21 apparmor: abstractions/base expects pid variable
Add 'pid' variable pointing to 'self' to allow parsing of profile to succeed

Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org> (github: Supermathie)
2014-04-07 02:47:43 -04:00
Michael Brown e35c23311f apparmor: docker-default: Include base abstraction
Encountered problems on 14.04 relating to signals between container
processes being blocked by apparmor. The base abstraction contains
appropriate rules to allow this communication.

Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org> (github: Supermathie)
2014-04-07 02:19:38 -04:00
Sven Dowideit a4b4448009 Merge pull request #4799 from tianon/no-more-inotifywait
Remove the inotifywait hack from our upstart host-integration example
2014-04-06 08:34:50 +10:00