Commit Graph

31 Commits

Author SHA1 Message Date
80ab61361c Merge remote-tracking branch 'origin/96-dns_issue-fix'
Upstream-commit: cdf90bb04b046058f6b1233846a1d5eb4fcf3810
Component: engine
2013-04-12 17:50:59 -07:00
1875a00c38 Allow use to set his own dns via -dns
Upstream-commit: 7673afc8438a9e46a1d11aff0f8c0f7eca169809
Component: engine
2013-04-12 10:43:13 -07:00
c36cca18b4 Detect and mark ghost container.
Upstream-commit: 313d13ea01f58c3e611fb85e435d36dd4907a6ac
Component: engine
2013-04-11 09:26:17 -07:00
4af9c309f0 Put the resolv.conf path in a variable instead of being hardcoded within lxc
Upstream-commit: 1f9f5eed5d004395886b8e93cec9389332d8fded
Component: engine
2013-04-10 18:23:34 -07:00
e53c739014 Make sure all containers (even previously stopped) get a correct wait lock
Upstream-commit: 9f83b9df2256c7b34453d5da85c17fae516ee3a4
Component: engine
2013-04-09 17:40:02 -07:00
fb9222b734 Add inconditionnal lock in Start/Stop/Kill to avoid races
Upstream-commit: 7c2b085d1a1394dc88b0cdf5c9df02ee1c1b2229
Component: engine
2013-04-09 09:09:54 -07:00
b8a98bd6d9 Remove the mutexes and use chan instead in order to handle the wait lock
Upstream-commit: 329f4449dc0f5722150a8160262b817e12be20fc
Component: engine
2013-04-09 07:57:59 -07:00
5140fcb35f Move the default bridge name to a constant
Upstream-commit: 1b370f9d8dbd1c476db766e8587617e795570d97
Component: engine
2013-04-04 05:33:28 -07:00
ae8058f403 Put the bridge interface name in the command line
Upstream-commit: f39af7e05da437d6ac95b19ccfa401598d1fb5d9
Component: engine
2013-04-03 16:15:43 -07:00
bb5c0135f0 Check WaitTimeout return in test, replaced lock initialization in runtime.Register() with call to initLock()
Upstream-commit: ad0183e41978b3b156234f801750034912915223
Component: engine
2013-04-03 10:48:02 -07:00
23a4c38130 Moved resetLock() to the Load() method ; changed resetLock() to initLock() and changed behavior to not modify the lock if it was already set (not nil)
Upstream-commit: d1767bbf672355b9063099d641106dd4ea5303b3
Component: engine
2013-04-03 05:39:39 -07:00
5e064a959a More thorough test case, use container.Stop() instead of lxc-kill,
use setStopped() during the restore step
Upstream-commit: c780ff5ae726bc8acd30b9ef476cd111c477ec35
Component: engine
2013-04-02 07:01:43 -07:00
4f419e5924 Check if the containers are really running when starting docker
Upstream-commit: 3dcaf20d6bf912cbc3eb689302d41047f9cd0f82
Component: engine
2013-03-31 17:40:39 -07:00
6d568468b4 Show shorthand container IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup containers
Upstream-commit: 0b9a3c86a26b4b7eb463a6c73cb030bc851fdd64
Component: engine
2013-03-31 02:02:01 -07:00
0ccd58f712 Do not log non-running containers
Upstream-commit: 0f7a4534c16cda07344a7231d6012268f4aa53aa
Component: engine
2013-03-29 08:46:06 -07:00
3e91a54abc Camelize some snake_case variable names
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
60f33c5a95 Set the container's hostname to the truncated ID
Upstream-commit: 54fa59c8ec0e20c709cc7b2049f19271750adaab
Component: engine
2013-03-26 13:14:44 -07:00
d64409ad42 'docker commit -m': optional commit message
Upstream-commit: 0d46ddf7b4940f7e9b1cecf00a9f608134cdbac8
Component: engine
2013-03-23 19:16:42 -07:00
71cb06de21 Add a Debugf() helper and a -D (debug) flag to docker
Upstream-commit: 6e507b9460b81e830ef2f5d10035d08e3948fe4d
Component: engine
2013-03-22 11:44:12 -07:00
6ae0955c01 Moved image name into config. runtime.Create() now receives a single Config parameter
Upstream-commit: 6ce64e8458b31aff150f2cae197d42e334018afa
Component: engine
2013-03-23 12:39:09 -07:00
3eb293999e runtime.Create receives an image name + Config. The Config includes all required runtime information: command, environment, ports etc.
Upstream-commit: 031f91df1a158d37f7f068ca1e17c25e1f112f29
Component: engine
2013-03-23 12:16:58 -07:00
cd778e8b2a 'docker tag': assign a repository+tag to an image
Upstream-commit: bf7602bc098888994eb28a2a6c9acd949a227448
Component: engine
2013-03-22 18:27:18 -07:00
977b51bc15 Integrate Auth in runtime and make the config file relative to runtime root
Upstream-commit: c72ff318d3fb6ab887af21cf4410e1bc8104663a
Component: engine
2013-03-22 02:19:39 -07:00
4e641b070f Looking up a tag by repository name will default to REPOSITORY:latest. The empty tag '' is no longer allowed.
Upstream-commit: 640026ec59d26172d5beddf97f3894d4374ddd4d
Component: engine
2013-03-22 16:07:13 -07:00
9e327a6d54 'docker commit' records parent container id and command, in addition to parent image
Upstream-commit: 05ae69a6eb72e012ed35422a6842038a01a24b61
Component: engine
2013-03-21 21:13:27 -07:00
bbcf46305d 'docker commit' can optionally tag the new image into a repository
Upstream-commit: 8396798ebae99791ce3f2f43c276af8e6b96d782
Component: engine
2013-03-21 20:07:37 -07:00
72717c4970 'docker run' can reference an image by REPOSITORY:TAG
Upstream-commit: 379d449c4417e505a3ea95a121680b318b757c46
Component: engine
2013-03-21 19:01:55 -07:00
ace2db29d7 Folded graph/ back into main package
Upstream-commit: ef711962d5d70b4332908f0ca6460929e289c131
Component: engine
2013-03-21 17:47:23 -07:00
d885b28d79 First integration of runtime with repositories & tags
Upstream-commit: 44faa07b6c472b888bed65b56126cde56658e91a
Component: engine
2013-03-21 17:35:49 -07:00
9e04074895 No need for a Container.networkManager field: it can be accessed via Container.runtime
Upstream-commit: d65983f386e4a355c404e8b68a85ab301c37a59c
Component: engine
2013-03-21 01:43:03 -07:00
16b646c2d9 Renamed docker*.go to runtime*.go
Upstream-commit: 377cebe36f4e4fc1cf927313df4a9c1cb6dc49cf
Component: engine
2013-03-21 01:24:54 -07:00