toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,344 Commits 3 Branches 295 Tags
4dd63976db352f9ee2e2a40ab1521917c89bbbd1
Commit Graph
7344 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Turnbull 4dd63976db Removed extra whitespace 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a2aa902ec194169431fea6784c4a7cdab25aaf24
Component: engine
 2014-04-08 12:07:27 -07:00
James Turnbull 1a88bac6fb Added Fedora installation method 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: fa5223dab5b9f5cef2a0a341ee5065fec9c6d663
Component: engine
 2014-04-08 12:07:16 -07:00
Victor Vieux 2f36bb5eb3 Merge pull request #5083 from shin-/4343-http_401_private_push_error 
Added specific error message when hitting 401 over HTTP on push
Upstream-commit: 29fd62f396c0f526138fe68792cdebde423c4790
Component: engine
 2014-04-08 11:19:17 -07:00
Michael Crosby d8ba8b0f57 Merge pull request #5085 from tianon/more-readable-crossplatforms-list 
Update DOCKER_CROSSPLATFORMS to be more readable
Upstream-commit: a056a9ca223a91be5aaaaa8a61c31b765903a381
Component: engine
 2014-04-08 11:08:57 -07:00
unclejack 313dc27451 Merge pull request #5068 from tianon/fix-abs-volume-check 
Fix edge case in bind mount absolute path detection
Upstream-commit: 1bcb9ce69e62476a8ff80d210aad85d86a72dd7b
Component: engine
 2014-04-08 20:03:52 +03:00
Tianon Gravi 792e71d487 Update DOCKER_CROSSPLATFORMS to be more readable 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cf655ca98d9c230d02454a39e815fc6b11ac5aed
Component: engine
 2014-04-08 09:42:47 -06:00
shin- 25edfd6bbc 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-)
Upstream-commit: 8b2bcd9a4bddf1b99ca201d81ac0a67c2b09fbe0
Component: engine
 2014-04-08 17:07:29 +02:00
Guillaume J. Charmes 06d3bd0a02 Merge pull request #5049 from Supermathie/aa-fix 
apparmor: docker-default: Include base abstraction
Upstream-commit: 8cfbc4466151666417a1245422ce0cb773d6d260
Component: engine
 2014-04-07 21:34:01 -07:00
James Turnbull 11e83cd4fc 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
Upstream-commit: fdfd4530fc0f55371a13d6df26e6938b48027a8b
Component: engine
 2014-04-07 21:28:02 -07:00
Sven Dowideit f111f492ef 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)
Upstream-commit: e6a64af966698d8b9dfe8721ca4404fc06331d69
Component: engine
 2014-04-08 14:25:57 +10:00
Tianon Gravi af8f9d4096 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)
Upstream-commit: 603088be928564be2d863a897fbc1729adc74814
Component: engine
 2014-04-07 21:20:03 -06:00
O.S. Tezer ccde663938 Merge pull request #5029 from ipbabble/manpages 
Added man pages for several docker commands. 
Upstream-commit: be3a5a2e375a3103883529c7da5563d94df036e3
Component: engine
 2014-04-08 05:51:20 +03:00
Guillaume J. Charmes a8f5408909 Merge pull request #5025 from dstine/readme-fix 
fixed two readme typos
Upstream-commit: 1d2126be6cf9937ee5ec2174aa2e2d02c07eb40c
Component: engine
 2014-04-07 19:31:16 -07:00
Dan Stine 9045165305 fixed three more typos 
Upstream-commit: 9c4d10b9a91b9f11794ceb094331496c733410bb
Component: engine
 2014-04-07 22:09:15 -04:00
Michael Crosby 14a144df20 Merge pull request #5064 from crosbymichael/remount-bind-mount 
Ensure that ro mounts are remounted
Upstream-commit: 6bf7104271519072c7a9b16b30d8ee550f24faf9
Component: engine
 2014-04-07 19:04:25 -07:00
Sven Dowideit f13ce48af5 Merge pull request #4997 from jpetazzo/apt-should-always-use-https 
Use https://get.docker.io/ubuntu consistently
Upstream-commit: 02c5a87b402cb1b575d84a86c118a1efcb6abd7f
Component: engine
 2014-04-08 11:24:07 +10:00
Michael Crosby ba83763b84 Ensure that ro mounts are remounted 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b6042f252dd8a0c7a75da481b667f89c2e4ab071
Component: engine
 2014-04-07 18:23:22 -07:00
William Henry b44d3f0991 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
Upstream-commit: da8231a26bc4532ded49f93a82e731694ee6587c
Component: engine
 2014-04-07 19:15:28 -06:00
Sven Dowideit 7ceff89f33 Merge pull request #4715 from sebsto/patch-1 
Include instruction for AMI 2014.03
Upstream-commit: 6e0d8ce8c350c32dcde79fdd34e414e8d28f53d7
Component: engine
 2014-04-08 11:02:54 +10:00
Victor Vieux 915eb0c0d9 Merge pull request #5058 from crosbymichael/remove-opts 
Remove -o cli flag and DriverConfig from HostConfig
Upstream-commit: 8c3eb900deb8c244e599b194270c3645c20e0809
Component: engine
 2014-04-07 16:45:54 -07:00
Michael Crosby bbc3856401 Remove and unexport selinux functions 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 028d44d12683b170704537c3435361ae8a4e74d8
Component: engine
 2014-04-07 14:59:44 -07:00
Michael Crosby 3a7c03a563 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)
Upstream-commit: 82f37b874ea17c5e0040f3e41dc761c88d576e33
Component: engine
 2014-04-07 14:44:53 -07:00
Michael Crosby b9794db272 Add more label checks for selinux enabled 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: aaf018017c88a707b35115a9411e4069d9356748
Component: engine
 2014-04-07 14:44:53 -07:00
Michael Crosby f0b2c345c0 Remove selinux build tag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b1e98e06dc62b0d25f98ea9a2fd94e41cc1d20e2
Component: engine
 2014-04-07 14:44:52 -07:00
Michael Crosby 84a11b7762 Move -o cli flag and DriverConfig from HostConfig 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ffebcb660f666e3a2a7be6b838ebd55f524d5b5d
Component: engine
 2014-04-07 14:44:52 -07:00
unclejack 0a6db7b36b Merge pull request #5010 from shykes/cli-tests 
Convert a legacy integration test to a clean v2 CLI integration test.
Upstream-commit: d8fc3eecf56cbb41b6ea5a438ffeb7be53d31923
Component: engine
 2014-04-08 00:34:58 +03:00
Solomon Hykes 42a6758106 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)
Upstream-commit: 30f22ee9e3ea1012ca663a0383c8c9c2330c52cc
Component: engine
 2014-04-07 20:34:21 +00:00
unclejack a8e470f581 Merge pull request #5057 from crosbymichael/refactor-runtime-create 
Refactor runtime create and history
Upstream-commit: 902f88ea156179d2d8095b34556738258792ca45
Component: engine
 2014-04-07 23:24:46 +03:00
Michael Crosby 8770121953 Clean runtime create and make it simple 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1277885420b069abd7468fe3e69deb4fb0a3f4fc
Component: engine
 2014-04-07 12:20:23 -07:00
James Turnbull 4684a5ac26 Merge pull request #4764 from SvenDowideit/use-docker-tgz 
Use docker tgz file to download on OSX
Upstream-commit: 7fddec4a65656844fd8c6aad85198273185450a2
Component: engine
 2014-04-07 11:54:27 -07:00
Jérôme Petazzoni 4fcce7c1ce 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)
Upstream-commit: dc7fefc16bfcc4e6d0ccb30233e50b0ab3d172f1
Component: engine
 2014-04-07 11:32:12 -07:00
Michael Crosby 786c7662ab Move history to separate file 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c987aa09d81a6916e3893c41b7ec2880570b5c65
Component: engine
 2014-04-07 11:01:35 -07:00
Victor Vieux 1e0b068ff4 Merge pull request #5040 from crosbymichael/remove-context-from-config 
Remove context from config
Upstream-commit: 2fde8dfb832b9041364e3f87b8d145256f3f0891
Component: engine
 2014-04-07 10:48:15 -07:00
Victor Vieux 0834ef63f2 Merge pull request #5039 from kzys/freebsd-timestamp 
Don't assume the file system has sub-second precision timestamp
Upstream-commit: 73a22fc6b31ad17ea5f1f51d54c445473e43655a
Component: engine
 2014-04-07 10:28:22 -07:00
unclejack f31296dbf7 Merge pull request #5038 from kzys/remove-archive-stat 
Remove archive/stat_unsupported.go because it is not used
Upstream-commit: 2f292a97de79a4fac698c91e328c06ea711b3632
Component: engine
 2014-04-07 19:50:31 +03:00
unclejack 0d8c1babc4 Merge pull request #5051 from SvenDowideit/build-rm-help 
intermediate image layers are used for more than the build
Upstream-commit: 1a3eb4967b0f76cf38d0cf4574484fd153976509
Component: engine
 2014-04-07 18:59:41 +03:00
Sven Dowideit dbddde5f2d intermediate image layers are used for more than the build 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 87ea27e80b131ca11d74c89446d4992af0f6c5b9
Component: engine
 2014-04-07 18:37:52 +10:00
Michael Brown 22496306d5 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)
Upstream-commit: 726206f2aa45b8a537ae6d6c819f21befc2e0aca
Component: engine
 2014-04-07 03:04:27 -04:00
Michael Brown ee2b8b0673 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)
Upstream-commit: 320b3e0d211d389addda02998a0f47839827b2af
Component: engine
 2014-04-07 02:47:43 -04:00
Michael Brown 70e9ec0c23 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)
Upstream-commit: e35c23311fce853fab318527789f11cc8c150ea2
Component: engine
 2014-04-07 02:19:38 -04:00
Sven Dowideit b3cdaaecc8 Merge pull request #4799 from tianon/no-more-inotifywait 
Remove the inotifywait hack from our upstart host-integration example
Upstream-commit: a4b4448009587e79a7a2ddef0178860fd3c01de7
Component: engine
 2014-04-06 08:34:50 +10:00
Kato Kazuyoshi c723ea81f4 Don't assume the file system has sub-second precision timestamp 
For example, FreeBSD doesn't have that
(see http://lists.freebsd.org/pipermail/freebsd-fs/2012-February/013677.html).

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 794b5de749fceea906222917e90bbc19e131ecc3
Component: engine
 2014-04-05 10:30:37 +09:00
Kato Kazuyoshi 53fdad7724 Remove archive/stat_unsupported.go because it is not used 
LUtimesNano and all other functions were implemented on pkg/system after
d6114c0da0e844199e3d23c60a04434566fb5392.

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: da8aa712d28cb7177b0fe5b4cc9d7de33ea1da60
Component: engine
 2014-04-05 10:09:04 +09:00
Victor Vieux 2ff6ba10e5 Merge pull request #5031 from crosbymichael/revert-env 
Revert env changes 
Upstream-commit: 36af2936af2e55216456dbe62e7fcbeff9b630d5
Component: engine
 2014-04-04 13:19:08 -07:00
unclejack a988fa74b7 Merge pull request #5027 from unclejack/cli_integration_add_docker_options 
Cli integration: add docker options & fix the wait at the end
Upstream-commit: 0fb76839adacc7ffe84cbe545aecf7f1e6f3464e
Component: engine
 2014-04-04 22:07:31 +03:00
Michael Crosby 0b7d68cb7c Revert "remove hack in version" 
This reverts commit b2b9334f27e1a773b77241efa214af2e87439d3b.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 07887f65de7f909e56bf965b3875a1dd46bd3619
Component: engine
 2014-04-04 11:38:03 -07:00
Michael Crosby 0f551f19fb Use setjson hack again for version 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 4c6cf9e27fd0ee6c09e836f03722d1c679b6bd29
Component: engine
 2014-04-04 11:37:08 -07:00
Michael Crosby 76c76ce8f5 Revert "engine: fix engine.Env.Encode() to stop auto-guessing types." 
This reverts commit 76057addb255e6f14dd03c276317abc759a15a80.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 95e6fd819bbef09032bf680e0f7dadd7fbf44559
Component: engine
 2014-04-04 11:29:56 -07:00
Victor Vieux 990afa43fd Merge pull request #5008 from unclejack/sync_cli_integration_ops 
cli integration: sync container & image deletion
Upstream-commit: a97305e4c04fc3f5062076230e6ce0e66860e2fd
Component: engine
 2014-04-04 11:16:08 -07:00
unclejack 010f288951 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)
Upstream-commit: 22152ccc47e641050da85b80cebf2912b42fd122
Component: engine
 2014-04-04 19:06:55 +03:00