1
0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Commit Graph

5871 Commits

Author SHA1 Message Date
Michael Crosby
2835e8d724 Improve aufs detection by looking at proc fs
Upstream-commit: 043a57617139dd4afefc2099e3bd85c8acaf0d68
Component: engine
2013-11-07 17:57:14 -08:00
Solomon Hykes
a38c2eb35b New 'dummy' driver uses plain directories and regular copy
Upstream-commit: 81674fbbdf657de2c1d13b7c84a41c9edd3c8aa1
Component: engine
2013-11-08 01:52:56 +00:00
Solomon Hykes
f94c689b1e Merge pull request #7 from crosbymichael/updated-interfaces
Updated aufs driver for new interface
Upstream-commit: 0a9df6bc1a8260fed2e038399106c8055689a9c8
Component: engine
2013-11-07 17:43:31 -08:00
Guillaume J. Charmes
600bb37cb7 Deprecate old tagging format
Upstream-commit: ef57752bce5c333d0e2b8352a84d071f21cce132
Component: engine
2013-11-07 17:30:51 -08:00
Michael Crosby
fb05315d03 Fix test for aufs graph and add aufs driver import
Upstream-commit: 12ffead71a06e5cf0ea4b1e6ce19231dceb265dc
Component: engine
2013-11-07 17:01:57 -08:00
Michael Crosby
681ed9aee0 Update aufs driver to new interface spec
Upstream-commit: b8b509e1c8c9b9def04850eaad8369b9ec6d9e0a
Component: engine
2013-11-07 16:46:47 -08:00
Solomon Hykes
7362e77db4 Move Change to the archive package
Upstream-commit: 01990b65a3cf3da5e04aa6612a17ead2a6cac2c9
Component: engine
2013-11-07 16:46:47 -08:00
Solomon Hykes
914824bce7 Move Change to the archive package, and fix a leftover merge in
Container.Inject()
Upstream-commit: 9ae4bcaaf8aa01da340341e47f99f83a59ce91dc
Component: engine
2013-11-08 00:45:07 +00:00
Solomon Hykes
783f801512 gofmt
Upstream-commit: f1127b9308fbb4d4e21c3c5567ace9fdda82559d
Component: engine
2013-11-07 23:58:03 +00:00
Guillaume J. Charmes
04b54bb7ce Merge pull request #2348 from SvenDowideit/2328-docker-events-since-date-string
Use string timestamp for docker events -since
Upstream-commit: 4f8b6c32830555d71fd1912610eeb82b66903821
Component: engine
2013-11-07 15:47:41 -08:00
Sven Dowideit
d03901e0ad Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
Upstream-commit: 01fea3cf116b768720b542ab65cbd1c2695848d0
Component: engine
2013-11-08 09:32:13 +10:00
Solomon Hykes
c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin
Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
2013-11-07 23:26:52 +00:00
Roberto Gandolfo Hashioka
163d4a5b8f - Included the sudo alternative as an example_header
Upstream-commit: eba3c36b386f389953eda6315948577200c9bf2c
Component: engine
2013-11-07 14:44:07 -08:00
Solomon Hykes
5d51812837 devmapper: port to the new driver API and reactivate driver
Upstream-commit: 4a8a7d4edd53251c8de7ea087b092869e15621d5
Component: engine
2013-11-07 22:41:55 +00:00
Solomon Hykes
7e3e167f73 Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
2013-11-07 22:38:50 +00:00
Victor Vieux
ce1bb0ce73 fix mergeConfig with new ports
Upstream-commit: 49c4231f077cb0b4804768231396c596d070a22f
Component: engine
2013-11-07 14:31:25 -08:00
Josh Poimboeuf
07f796bd96 network: add iptables rules to explicitly allow forwarding
Explicitly enable container networking for Fedora and other distros that
have a REJECT all rule at the end of their FORWARD table.
Upstream-commit: ec4657b28a3e97447921357d454df974e0979ac6
Component: engine
2013-11-07 16:23:39 -06:00
Roberto Gandolfo Hashioka
c81beb4bbc - Fix the attach examples according to the new attach behavior
- Add the option of adding the user to docker's group and avoid the usage of "sudo" before each command
Upstream-commit: 304d39cc505ff51682dd7e1337f9f0ab7536eec3
Component: engine
2013-11-07 14:06:49 -08:00
Alexander Larsson
65b7bbeca7 archive.ApplyLayer() remove files recursively
Some aufs metadata are directories, and whiteouts can be for
directories, so use os.RemoveAll() for these.
Upstream-commit: 484804abffda2692492e295d4691f90564d05eb2
Component: engine
2013-11-07 22:46:44 +01:00
Michael Crosby
e285c55a83 Merge pull request #2589 from dotcloud/gofmt
Go fmt
Upstream-commit: cd4f7321c932efe2c95e221e2e685856c79ef30d
Component: engine
2013-11-07 12:32:58 -08:00
Solomon Hykes
4629ddf3be Fix a crash in graphdriver init
Upstream-commit: a63ff8da46e11c857cd3d743d72d211c96b637e4
Component: engine
2013-11-07 20:31:50 +00:00
Solomon Hykes
a48448b288 Internal cleanup: use the mounted container filesystem instead of manipulating the aufs layers directly
Upstream-commit: 77ae9789d3e1cfb895de9eaf343866f984c92668
Component: engine
2013-11-07 20:30:56 +00:00
Michael Crosby
8d5420a376 Merge pull request #2591 from dotcloud/fix_Assign_id_as_name_when_all_else_fails
Fix Assign id as name when all else fails
Upstream-commit: 132db329d479c1d8712117534798810df8c1b8ec
Component: engine
2013-11-07 12:29:02 -08:00
Guillaume J. Charmes
6d24142423 go fmt
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
2013-11-07 12:27:33 -08:00
Victor Vieux
b5fe937fc9 fix Assign id as name when all else fails
Upstream-commit: 26f846bf779c97a69e85db356dff8c1fff76161c
Component: engine
2013-11-07 12:23:29 -08:00
Andy Rothfusz
9fe27fc825 Fix 2585 and clean up warning in contributing.rst
Upstream-commit: 97c3de7e6b92b13efa30c5c840ce2fab07b8794e
Component: engine
2013-11-07 12:20:23 -08:00
Michael Crosby
61da922aa3 Merge pull request #2561 from dotcloud/add_iptabled_errors
Make iptable return an error in case of output
Upstream-commit: b5c984f9b4899d577430134135379b0088d88b47
Component: engine
2013-11-07 09:15:09 -08:00
Daniel Mizyrycki
ba4e682cde docker-ci 0.4.5: Sync tests with progress in docker and docker-registry. Use revamped shiny DinD.
Upstream-commit: 249f76bebdb3c24ae0a59e3be7ae73fd1d88c065
Component: engine
2013-11-06 20:05:26 -08:00
Daniel Mizyrycki
83a4080e03 docker-ci 0.40. Migrate docker-ci to Digital Ocean.
Upstream-commit: e7df38dbd0c7bf2d27632809fc49cacb0cc7f869
Component: engine
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
837c6b480c docker-ci 0.37. Patch hack/dind with latest code for docker-test.
Upstream-commit: efb4c800a7c8167cf2202466a720c0fad7001a5d
Component: engine
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
7a7c9f0f1d docker-ci 0.36. Patch hack/dind with latest code for nightly release to work.
Upstream-commit: 0cbeda73910d6d1d3336da93c5f94df0bdd5fa44
Component: engine
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
aac90cd92e docker-ci 0.35. Push docker coverage and testing into docker-ci production. Update docker nightlyrelease
Upstream-commit: 17172276366fc3114ae52eb6c83aafbec004d5f3
Component: engine
2013-11-06 19:13:58 -08:00
Daniel Mizyrycki
6b8ac9d257 testing infrastructure, issue #1800: Refactor docker testing using Docker in Docker
Upstream-commit: 50dd9791f75efef77a85bbe6556c85de0d845c0a
Component: engine
2013-11-06 19:13:58 -08:00
Andy Rothfusz
80db89881c Fix bold
Upstream-commit: 9990db2f5a762fdbc198cbfc5e96370d859739bb
Component: engine
2013-11-06 18:07:55 -08:00
andy diller
9970f516fc updated create, showing how to set expose port and bind to public port for ssh
Upstream-commit: 2d1155407a6e24b595d2627af6fa9f9f702483d2
Component: engine
2013-11-06 18:07:55 -08:00
Andy Rothfusz
d4449d4111 Merge pull request #2557 from jamtur01/new_redis
Updated Redis service example to use links. Removed "Linking Redis" example as redundant.
Upstream-commit: 37dcff0c13c6e4ee71b22b7e4902c2e4b4b88132
Component: engine
2013-11-06 17:54:34 -08:00
Andy Rothfusz
493375c769 Merge pull request #2567 from mck-/patch-1
Add -p when running the container (node example)
Upstream-commit: 38f1838e821822037f334dc4aee1da9a3c76c53c
Component: engine
2013-11-06 17:34:11 -08:00
Andy Rothfusz
a16746b24c Merge pull request #1794 from justone/add-images-tree
add -tree option to images
Upstream-commit: 807a305f36c54d54a20109992f4f301b62ae0081
Component: engine
2013-11-06 16:12:36 -08:00
Victor Vieux
0e9c1fdcf5 Merge pull request #2577 from dotcloud/bump_v0.6.6
Bump v0.6.6
Upstream-commit: cb1c90975bbb2b3962b2ba611c58adac69bcf0c1
Component: engine
2013-11-06 13:41:52 -08:00
Nate Jones
85bf6b92cb updating cli help doc for images
Upstream-commit: 363738b8f21d02c2e4fac84bd2776c2d4a5e6755
Component: engine
2013-11-06 12:03:45 -08:00
Victor Vieux
6863c4fe21 Merge pull request #2577 from dotcloud/bump_v0.6.6
Bump v0.6.6
Upstream-commit: 6d420407caf533f89b60d78c54e0ddc2d307e942
Component: engine
2013-11-06 12:03:03 -08:00
Alexander Larsson
5edb271922 lxc: Work around lxc-start need for private mounts
lxc-start requires / to be mounted private, otherwise the changes
it does inside the container (both mounts and unmounts) will propagate
out to the host.

We work around this by starting up lxc-start in its own namespace where
we set / to rshared.

Unfortunately go can't really execute any code between clone and exec,
so we can't do this in a nice way. Instead we have a horrible hack that
use the unshare command, the shell and the mount command...
Upstream-commit: 157d99a72786c454dfaad8b0800914cc80879aa8
Component: engine
2013-11-06 20:43:06 +01:00
Victor Vieux
7bfea51316 Bump version to v0.6.6
Upstream-commit: 360a694c52a48e0305317a18c59dc5ddc44859ad
Component: engine
2013-11-06 11:43:02 -08:00
Alexander Larsson
58f4b4c19f Utils: Add ShellQuoteArguments
Upstream-commit: c5bc7d515836cffee90ba5bb342272bba64d9f37
Component: engine
2013-11-06 20:39:09 +01:00
Nate Jones
143de969f1 fix /images/json doc for 1.7
Upstream-commit: 16eba6bbb514fb4082e6779e175a29698a6734ce
Component: engine
2013-11-06 11:30:04 -08:00
Victor Vieux
34d9e796b2 Merge pull request #2568 from mrallen1/fix/1965
See if a path exists before injecting Reader there
Upstream-commit: 0dd6c6645bd7148537c6e4b3b32abe1c852b992c
Component: engine
2013-11-06 10:57:06 -08:00
Michael Crosby
a135b385fd Update documentation to reflect changes in Config and HostConfig
Upstream-commit: 70f44d5531a5c6dcb96b7e608a96beb52e93b506
Component: engine
2013-11-06 10:01:58 -08:00
Guillaume J. Charmes
d677b4b873 Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change
change ID to CONTAINER ID/IMAGE ID
Upstream-commit: 45aba3dc959d867147fedc8e8ac578d2acfb4d79
Component: engine
2013-11-06 09:45:23 -08:00
Guillaume J. Charmes
2e67093fd5 Merge pull request #1577 from mrallen1/fix/1502
Prevent DNS server conflicts in CreateBridgeIface
Upstream-commit: c22ff0296e743443b3d79b0bd5f8b9bd97a77e13
Component: engine
2013-11-06 07:52:50 -08:00
Guillaume J. Charmes
563816191a Add debug to iptables
Upstream-commit: 00f1398f7a8543e2448723635d93ea6ddf1eaadb
Component: engine
2013-11-06 07:37:43 -08:00