d8be5aafec
rebase master
...
Upstream-commit: bf7d6cbb4af2e7176c66d2ad74515699b7898fea
Component: engine
2013-07-08 13:26:29 +00:00
8f5746f4d9
Mutex style change.
...
For structs protected by a single mutex, embed the mutex for more
concise usage.
Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
Upstream-commit: 1cf9c80e976fb60b4d5d489cd1c4c9959bcc4f7f
Component: engine
2013-07-02 15:53:08 -07:00
805a9b9625
never remove the file and try to load it in start
...
Upstream-commit: 3042f11666a38ea6b1da206de372bf85463db945
Component: engine
2013-07-02 18:02:16 +00:00
be9588204f
store hostConfig to /tmp while container is running
...
Upstream-commit: 06b53e3fc7aca2b3dae32edab08c7662d3e9e7e8
Component: engine
2013-07-02 12:19:25 +00:00
a223caa9e6
+ Runtime: mount volumes from a host directory with 'docker run -b'
...
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
ffff9b2ac4
Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker".
...
Upstream-commit: e44f62a95cc8f3cab446205d66450ee37911e29c
Component: engine
2013-06-20 16:29:54 -05:00
72a9843fea
Add -dns to docker daemon
...
Upstream-commit: 84d68007cb36b68e1b5c574a0d23fcf583e0d75c
Component: engine
2013-06-05 14:20:54 -07:00
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
9c0086fb7d
drop/omit
...
Upstream-commit: 86ada2fa5d00820288df8a59eca3deef83f4aeb6
Component: engine
2013-06-04 13:51:12 +00:00
c376c6e645
Move getKernelVersion to utils package
...
Upstream-commit: f3bab52df4c6b54218ed36ac354ffc3573d31f3b
Component: engine
2013-05-15 17:40:47 -07:00
2d208e56c7
Move authConfig from runtime to registry
...
Upstream-commit: 95dd6d31a4c11618836f9a55fc3dbbde48450b09
Component: engine
2013-05-15 17:17:33 -07:00
bc6fad489c
Create a subpackage for utils
...
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
b1cb259eb1
Reduce the Destroy timeout from 10 to 3 seconds
...
Upstream-commit: 28fd289b448164b77affd8103c0d96fd8110daf9
Component: engine
2013-05-09 21:53:59 -07:00
664f8fbbbd
Check the command existance prior create and add Unit tests for the case
...
Upstream-commit: 42b1ea4889cd61790f81001ada5deac9354be378
Component: engine
2013-05-07 11:18:13 -07:00
ba650a016c
Rebase master (autorun)
...
Upstream-commit: 6c168a8986261c95ae5e036f008375f77afbe78e
Component: engine
2013-05-06 16:01:00 -07:00
0c47ce6243
Move runtime.Commit to builder.Commit
...
Upstream-commit: f7c5e92a2e1ec30f50b0affe952a0496c62195f5
Component: engine
2013-05-06 16:00:30 -07:00
830fa88486
Moving runtime.Create to builder.Create
...
Upstream-commit: 6f2125386a07a01eccce3bb4602aeecb8be3458b
Component: engine
2013-05-06 16:00:30 -07:00
f2c645d68e
Fix the command existance check
...
Upstream-commit: b9ec03c21b8fdbc54fdd7a3cb86f3c555e91f989
Component: engine
2013-05-02 20:50:28 -07:00
e6dd1bf4aa
Fix server crash when running an image without command without autorun
...
Upstream-commit: 64d7bc442daa012683b38183c71674b9ecd660c2
Component: engine
2013-05-02 13:56:45 -07:00
1e4304b721
Fix issue within mergeConfig preventing hostname and user to be set
...
Upstream-commit: 83784989514ca010bf6c292b01482e0baa14ff85
Component: engine
2013-05-02 12:32:10 -07:00
be84d975bd
docker run -v PATH: bind a new data volume to a container
...
Upstream-commit: 1df5f4094bf31edba6f2a2f07bfdada54340c1e4
Component: engine
2013-05-02 09:14:22 -07:00
c9f8d85006
Merge pull request #482 from dotcloud/move_capabilitie_function
...
* runtime: Move the capabilities detection into a runtime method
Upstream-commit: e431dc26f115cee290b9bfcdf73a1ea4eebecfce
Component: engine
2013-05-01 17:43:32 -07:00
0f53d29623
+ Commit default runtime options with a layer
...
Upstream-commit: f7aaa06606e0acf36d2979533f40e51ae7ef29c0
Component: engine
2013-05-01 11:33:21 -07:00
b7c2a5f9a1
Actually use the mergeConfig function
...
Upstream-commit: 7ff65d40d557e0a128534c096f3cab0c10a79f7b
Component: engine
2013-05-01 11:22:06 -07:00
91fa0f0669
Move the capabilities detection into a runtime method
...
Upstream-commit: 9042535f5af607f2362fa3f995427e1c5aab664e
Component: engine
2013-04-26 14:32:55 -07:00
45f51cdc1d
Implement -config and -command in CmdCommit in order to allow autorun
...
Upstream-commit: 51d6228261cdc379aade581ee504b2c59a3e02a9
Component: engine
2013-04-25 16:48:31 -07:00
85eee11a06
Add -r flag to dockerd in order to restart previously running container. Fixes #26
...
Upstream-commit: 50144aeb42283848db730b936d6b5b6332ec6565
Component: engine
2013-04-24 19:01:23 -07:00
55a64b53cc
- Runtime: ghost containers can be killed.
...
Upstream-commit: 95e066d24fc4d9248e5e98f6d8ce018764834547
Component: engine
2013-04-22 22:30:33 -07:00
e0f172a6ff
Allow to wait on container even after docker server restarts using lxc-info
...
Upstream-commit: 82848d415866d08121bb52857e7d7b1d2a952c0c
Component: engine
2013-04-22 17:52:38 -07:00
14226bf464
Do not prevent docker from running when kernel detection fails
...
Upstream-commit: 3514e47edc2d3cdaae2d92a78cc5c618d9549f13
Component: engine
2013-04-22 11:26:34 -07:00
1e9641c3d7
Do not stop execution if cgroup mountpoint is not found
...
Upstream-commit: 71b580661451c35f01ee3824506f572c52d86ac8
Component: engine
2013-04-22 00:44:57 -04:00
dad1da85a7
Merge remote-tracking branch 'origin/check_kernel_capabilities'
...
Upstream-commit: 76b40ad6c994d8eb4c969802a172d8a808b1ac35
Component: engine
2013-04-20 17:40:25 -07:00
d2c7306555
Merge pull request #415 from dotcloud/261-choose_grace_period-feature
...
added -t in docker stop and restart to choose grace period
Upstream-commit: e92c4b1f39eae970ca5f61abb7537ecc09b42431
Component: engine
2013-04-19 12:42:34 -07:00
b4f4a13791
Use mount to determine the cgroup mountpoint
...
Upstream-commit: f3e89fae287778cb8b7056e228170e0073c9a046
Component: engine
2013-04-18 21:57:58 -07:00
b6710144e6
Add capabilities check to allow docker to run on kernel that does not have all options
...
Upstream-commit: 640efc2ed2244dc16e161cc954af59d20a5e6ed2
Component: engine
2013-04-18 20:55:41 -07:00
4408440fb3
Check kernel version and display warning if too low
...
Upstream-commit: 003622c8b6587814744a9903f3286dc1b07554c2
Component: engine
2013-04-18 20:47:24 -07:00
51cf529c26
Added 'author' field to the image format
...
Upstream-commit: 4ef2d5c1e6e65b1e214071388618fc9fa4345be9
Component: engine
2013-04-17 19:58:17 -07:00
2638d9a6cc
added -t in docker stop and restart to choose grace period
...
Upstream-commit: 1615bb08c7c3fc6c4b22db0a633edda516f97cf0
Component: engine
2013-04-17 11:56:30 +02:00
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
