p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,871 Commits 2 Branches 295 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph

203 Commits

Author SHA1 Message Date
Michael Crosby
1feadd553a Simplify logic for registering ports 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: da61b99b392657343df4dc221ba5cd9ad6b1c9e1
Component: engine
 2014-01-26 14:01:38 -08:00
Victor Vieux
225e97e755 Merge pull request #3724 from creack/extract-lxc-phase-2 
Refactor process to command
Upstream-commit: 0dd856ee7f636c82e9420ebbd9e2d0b3aeea5136
Component: engine
 2014-01-23 15:28:45 -08:00
Michael Crosby
96dad4beb8 Populate command in ghost state to pass to RestoreCommand 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8723a8a89ec7d5b2a37e0536d7aadd78e5329773
Component: engine
 2014-01-22 14:05:01 -08:00
Guillaume J. Charmes
3467e8dad5 Populate Command self cointainer (toward Restore()) 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 75e0357d691499b20dc903b702bc44c444f85005
Component: engine
 2014-01-22 14:04:55 -08:00
Guillaume J. Charmes
47913f96e1 Merge pull request #3073 from alexlarsson/refcount-driver-mounts 
Refcount driver mounts
Upstream-commit: f61a91f50a753e0b8878675b4bab8ee4dc2a70e1
Component: engine
 2014-01-22 11:42:17 -08:00
Guillaume J. Charmes
f30d57c548 Fix wait on stopped container (after docker restart) + add Unit test for that case 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 0376a69cb1cc839f7e1a147623b399147a5976c9
Component: engine
 2014-01-21 16:49:24 -08:00
Alexander Larsson
36def61b75 Remove container.EnsureMounted 
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 191aa17d16c0935a7deda03b4c3bc879f7a316eb
Component: engine
 2014-01-21 11:26:11 +01:00
Alexander Larsson
5e35604785 Add Put() to graphdriver API and use it 
This makes all users of Put() have a corresponding call
to Get() which means we will be able to track whether
any particular ID is in use and if not unmount it.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bcaf6c2359d83acd5da54f499e21f4a148f491c5
Component: engine
 2014-01-21 11:25:37 +01:00
Guillaume J. Charmes
5b95959a09 Rename Process to Command 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 12468f2bc8a72a6bedfd681084863ea95b48713b
Component: engine
 2014-01-20 16:05:07 -08:00
Guillaume J. Charmes
72a4c2e064 Rename Capabilities in sysinfo and move it to its own subpackage 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: crosbymichael)
Upstream-commit: 9e9f4b925b4b6a58a03bbff09150f1314d5fe3b2
Component: engine
 2014-01-17 17:42:58 -08:00
Guillaume J. Charmes
ae872300fb Cleanup + add Info to driver in order to have specific IsRunning() 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: crosbymichael)
Upstream-commit: 889b4b10ae3ec1d6e7879c30860aafd7674cb576
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby
ecb354d61e Improve wait for lxc and driver interface 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c9f62d037a1bc82742ea316adaaf658af56b7c3
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby
28c45914a4 Make exec driver run a blocking command 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f846ecdc77bb9ab4d44b41a2e403bcf579d6b6e9
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby
98268ad2c1 Add chroot driver for testing 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8e0741f5e40d107780a5be1f6ae0f4d30ba43d7d
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby
695537a626 Update with lxc unconfined changes 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 93ead2fe789a3a94a8433b12efcca782e0a7d7de
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby
a8716549d6 Rework monitor and waitlock inside of driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8e87835968a4c6233406061759e3dca03ab86989
Component: engine
 2014-01-17 17:42:22 -08:00
Michael Crosby
f9406fce53 WIP complete integration test run 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5a3d9bd432fdaa95f870d4d99fad1d6fafeaad92
Component: engine
 2014-01-17 17:42:21 -08:00
Michael Crosby
dc2dffef1c Integrate process changes in container.go 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f2680e5a5b1fc2393dfe319fe4dd197672985411
Component: engine
 2014-01-17 17:42:21 -08:00
Victor Vieux
2514b9eb9b Merge pull request #3420 from RoelVanNyen/getfullname 
Cleanup: runtime.getFullName is deprecated by getFullName
Upstream-commit: a0298c0bd070400b4acaad3c2d285037b5875552
Component: engine
 2014-01-06 13:59:04 -08:00
Paul Nasrat
0ccbdf155d Extract cgroups utilities to own submodule. 
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
Upstream-commit: c561212b837735213f146c2fac291f84dbcbc8c3
Component: engine
 2014-01-02 17:54:57 -05:00
Roel Van Nyen
bde96d77e1 Cleanup: runtime.getFullName is deprecated by getFullName 
Upstream-commit: 9dd7ae4074ecfceb62c3c3eae1811c5bd018c38c
Component: engine
 2014-01-02 00:06:50 +01:00
Solomon Hykes
10227320c8 Move utility package 'graphdb' to pkg/graphdb 
Upstream-commit: d16d748132330ff58e142472a579d1f6c65e3eac
Component: engine
 2013-12-23 23:33:06 +00:00
Guillaume J. Charmes
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
Victor Vieux
dbe3d58b07 Merge pull request #3271 from crosbymichael/mount-outside 
Perform docker specific mounts outside of lxc
Upstream-commit: f21bd80e90af12745c7a8bf98d84ec50c3295987
Component: engine
 2013-12-19 11:13:31 -08:00
Michael Crosby
69bf3879ed Move sqlite conn to graph db for cross compile support 
Upstream-commit: 329d154209f8da83226e729222dafff4e214b25d
Component: engine
 2013-12-18 21:14:16 -08:00
Michael Crosby
dd4dc32856 Improve interface by moving to subpkg 
Enable builds on OSX
Upstream-commit: 7bc96aec7bf978e87cb87935bd55f85e2cb1664a
Component: engine
 2013-12-18 16:42:49 -08:00
Michael Crosby
8eec37c741 Handle external mounts outside of lxc 
Upstream-commit: 45d7dcfea276841cce782feced3a2eb3eab01208
Component: engine
 2013-12-18 13:46:02 -08:00
Victor Vieux
766980f441 add some debug to runtime.restore() 
Upstream-commit: fde909ffb8e09ae39310093b7389f61aa4ec29df
Component: engine
 2013-12-18 10:57:21 -08:00
Jonathan Rudenberg
b6d7266c64 DRY up valid container name pattern usage 
Upstream-commit: 3ec39ad01a5823acbb3c4ce49ce5c81258a60815
Component: engine
 2013-12-17 20:17:50 -05:00
Jonathan Rudenberg
3c037baf07 Add '.' to valid container name pattern 
Upstream-commit: 1940015824f5dabf1e8ffbd0c2b7c09f11f8cdf0
Component: engine
 2013-12-17 20:17:06 -05:00
Tianon Gravi
af74b97c6a Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed 
Upstream-commit: 2035af44aae3664b217d6903cbf39c259f568490
Component: engine
 2013-12-16 22:29:00 -07:00
Sven Dowideit
77b832e35d when sharing a /var/lib/docker dir with more than one distribution, an existing lxc-start-unconfined softlink may point to a non-existant path, following that link (as Stat does) will cause the daemon to fail to start 
Upstream-commit: 0a3eedd4c9d2bed208a85cd7aefae050a821eb6b
Component: engine
 2013-12-14 15:29:08 +10:00
Guillaume J. Charmes
7d30838e63 Merge pull request #3197 from ajhager/3138-names 
Validate container names on creation. Fixes #3138
Upstream-commit: a6928e70ace51793c15160e5f7206855abab89ff
Component: engine
 2013-12-13 17:28:36 -08:00
Guillaume J. Charmes
db82e5f1c7 Merge pull request #2897 from crosbymichael/aufs-42 
Increase max image depth to 127
Upstream-commit: f5ab2516d8d50c2ef756fe92d7218bc3248d714a
Component: engine
 2013-12-13 16:03:57 -08:00
Joseph Hager
acf919be05 Validate container names on creation. Fixes #3138 
Move valid container name regex to the top of the file

Added hyphen as a valid rune in container names.

Remove group in valid container name regex.
Upstream-commit: f63cdf0260cf6287d28a589a79d3f947def6a569
Component: engine
 2013-12-13 14:14:05 -05:00
Michael Crosby
738aed6186 If container does not exist try to remove the name and continue 
Upstream-commit: 7bf3a07371bb0baed21b59d60835ed2f4877b571
Component: engine
 2013-12-05 15:22:21 -08:00
Michael Crosby
7e8e4fe649 Ensure that the init layer is removed with the container 
Upstream-commit: 5976c26c1e7bc7b29489250b8100412ea3d27b60
Component: engine
 2013-12-03 09:44:48 -08:00
Sven Dowideit
f43b960fe1 there appears to be a slash prepended to a container name internally - don't tell the user about it in an error message, it might cause them to worry about it 
Upstream-commit: 1cb7b9adc6b9a4e4c8f746c6886a7229b0efda91
Component: engine
 2013-11-27 12:58:54 +10:00
Michael Crosby
aaebc7758b Increase max image depth to 127 
Upstream-commit: 6d34c50e898507e461300ecf91ed661011bc15ab
Component: engine
 2013-11-26 17:04:55 -08:00
Marek Goldmann
f587c327f7 Fix the 'but is not' typo. 
Upstream-commit: 9c15322894152095539e41623ef33ec0ebdc6c3f
Component: engine
 2013-11-26 11:18:50 +01:00
Victor Vieux
db32c4ebfa create a copy of dockerinit 
Upstream-commit: 110c4f20434af89d81580670f2cec25b1e82633a
Component: engine
 2013-11-25 20:21:54 -08:00
Guillaume J. Charmes
020e2aed63 Merge branch 'master' into use_utc_time 
Conflicts:
	image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
 2013-11-25 19:01:13 -08:00
Michael Crosby
a54274e072 Rename dummy driver to vfs 
Upstream-commit: cee0a292d0b9afe96a1b4a2c66910f2485af2482
Component: engine
 2013-11-25 09:04:04 -08:00
Michael Crosby
cf914fd88c Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
 2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
eec0335af0 Use UTC for time 
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
 2013-11-21 16:43:36 -08:00
Guillaume J. Charmes
915356af08 Refactor State to be 100% thread safe 
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
 2013-11-21 16:34:58 -08:00
Michael Crosby
f6524ff456 Handle image metadata when drivers are switched 
Upstream-commit: 1b28cdc7f977f265d0d8de53e8ec1d773ed54db1
Component: engine
 2013-11-20 10:31:51 -08:00
Victor Vieux
48e095ca19 Merge branch 'master' into vieux_merge_master 
Conflicts:
	runtime.go
Upstream-commit: cd022376b8eda39ac23debc6b52fee46e08fcfdb
Component: engine
 2013-11-19 17:32:08 -08:00
Michael Crosby
ad8fb52fd4 Merge pull request #2750 from jpoimboe/simplify-register-reconnect 
Simplify the runtime Register reconnect logic
Upstream-commit: 234f5ac39f22b02cce62d789283a4ed80b728fe2
Component: engine
 2013-11-19 17:30:59 -08:00
Michael Crosby
127023e5bb Merge pull request #53 from shykes/improve_cleanup 
Improve aufs cleanup and debugging
Upstream-commit: d4ef551d654b6b3b91aed68152789fc2869d83fd
Component: engine
 2013-11-19 17:16:36 -08:00