2ac307781e
Use a *println or *print function instead of *printf where appropriate.
...
Upstream-commit: c298a91f95dafb056cede9036f5e81f259b8f3e9
Component: engine
2013-04-01 12:17:00 -07:00
28343696b9
Show shorthand image IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup images
...
Upstream-commit: 1632566ecb133fb0853aec6715c5c06a4a9e41da
Component: engine
2013-03-31 22:11:55 -07:00
bd2e319579
Temporarily disable a broken test (waiting for @creack to fix it), and silence a warning which pollutes unit tests but is complicated to fix
...
Upstream-commit: a52a28b60946463e8208b8cd5d737ba79f23a8b8
Component: engine
2013-03-31 22:05:14 -07:00
a591bf3f3d
gofmt
...
Upstream-commit: 54443c092caf9c1e11c47ea30400084d009af6e9
Component: engine
2013-03-31 22:04:59 -07:00
8a40ce58f3
Make IP allocator lazy
...
Instead of allocating all possible IPs in advance, generate them as
needed.
A loop will cycle through all possible IPs in sequential order,
allocating them as needed and marking them as in use. Once the loop
exhausts all IPs, it will wrap back to the beginning. IPs that are
already in use will be skipped. When an IP is released, it will be
cleared and be available for allocation again.
Two decisions went into this design:
1) Minimize memory footprint by only allocating IPs that are actually
in use
2) Minimize reuse of released IP addresses to avoid sending traffic to
the wrong containers
As a side effect, the functions for IP/Mask<->int conversion have been
rewritten to never be able to fail in order to reduce the amount of
error returns.
Fixes gh-231
Upstream-commit: 6f9a67a7c7cb717ad1a575df3e4c0fd2ec8bc651
Component: engine
2013-04-01 06:02:44 +02:00
0d0aacb146
Add a check to avoid double start (resulting in dockerd to panic) and unit test for it
...
Upstream-commit: d949e2804a35497bc041537734dfeff150ea7e21
Component: engine
2013-03-31 14:15:10 -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
10d17433d1
Close the containers stdin when the process dies
...
Upstream-commit: 47607494027be3d37cbb01a07e026e99f9c5151b
Component: engine
2013-03-30 09:08:53 -07:00
4a407f8199
Fix a scope issue preventing the close of slave stdin pty ( #228 )
...
Upstream-commit: 7efde5eb8350ad709608e619b01af4108cc9d567
Component: engine
2013-03-30 09:07:54 -07:00
8e072eedc0
Store the master ptys in order to close them when the process dies ( #228 )
...
Upstream-commit: 5252ab697c927d7b51109a1bb1a68d6a3dfc88b3
Component: engine
2013-03-30 09:05:53 -07:00
3f6c2c9af6
Merge pull request #265 from dotcloud/formating_debug_harmonize
...
Formating debug harmonize
Upstream-commit: d0d5d5ff094a5c03a6b13a18394108cda126eef2
Component: engine
2013-03-29 21:30:43 -07:00
0ccd58f712
Do not log non-running containers
...
Upstream-commit: 0f7a4534c16cda07344a7231d6012268f4aa53aa
Component: engine
2013-03-29 08:46:06 -07:00
38f2e38ea3
Remove unused variable from container struct
...
Upstream-commit: 7a565a0479b6a797a0cdc9a4156e57ce811032b3
Component: engine
2013-03-29 08:41:48 -07:00
a659bdb4eb
Add some error checking in container monitor
...
Upstream-commit: 69c2250ec2fd23dc9d31372cb433b7c18a917d09
Component: engine
2013-03-29 08:29:59 -07:00
2588801f2a
Harmonize the error management. Use fmt.Errorf instead of errors.New
...
Upstream-commit: d17f78c373d5d8cd015626c7972e0e2365eab2a7
Component: engine
2013-03-29 08:19:42 -07:00
f235c36167
Add debug infos
...
Upstream-commit: ccac5b138253ab87846089cb5af9b4b77a7fd9d5
Component: engine
2013-03-29 08:18:43 -07:00
2c32113c8a
Remove unnecessary part of paths to lxc executables
...
Upstream-commit: 6d72758f1268f710be635cb16ef8e001fc6516a5
Component: engine
2013-03-29 12:07:25 +07:00
3e91a54abc
Camelize some snake_case variable names
...
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
de5854920d
#189 Fix the env in TTY mode
...
Upstream-commit: cca59081de9dc243fefe2816ded509bd4e1caad9
Component: engine
2013-03-26 07:01:59 -07:00
81a51af591
Re-enabled help for run command and added client-side error messages when arguments are missing
...
Upstream-commit: 2333be46aae0473ec244176882bd6188d4c16ce2
Component: engine
2013-03-26 08:31:26 -07:00
06de045b6d
Force xterm as TERM in tty mode
...
Upstream-commit: c85db1003be5d7cce4c5f94993980acc82db24d3
Component: engine
2013-03-25 19:20:18 -07:00
817a5a63f1
Fix termcaps on the linux client
...
Upstream-commit: 50bee2f8114ce562d63b08665f7371aa5a568b2c
Component: engine
2013-03-25 18:44:05 -07:00
d858c53217
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: bd63ae72e611fcd3f14ff51fb62ab58aebdd810d
Component: engine
2013-03-25 14:25:17 -07:00
9aac936e9c
Fixed issue #158 (docker crashes when docker run is called with not enough arguments)
...
Upstream-commit: c8ca50b48328448d70c3f227dc7bb8d65a980f6b
Component: engine
2013-03-25 07:17:11 -07:00
4cbb9e0f0d
Prevent container.Kill() from crashing if container.cmd is nil
...
Upstream-commit: b32436cd2ea1f206cf5758170172f46dafb1f43c
Component: engine
2013-03-23 19:51:35 -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
4c9c80d04b
'docker run -e': set environment variables in a container
...
Upstream-commit: 34fbaa5f6d0d8bd31504f43db56090be6dfa9af4
Component: engine
2013-03-22 20:36:34 -07:00
ace2db29d7
Folded graph/ back into main package
...
Upstream-commit: ef711962d5d70b4332908f0ca6460929e289c131
Component: engine
2013-03-21 17:47:23 -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
bf245fb6d9
moved GenerateId() to the graph package
...
Upstream-commit: 0208b6accddd4f8c8ccfb380dd281ac208fe19d1
Component: engine
2013-03-21 01:07:07 -07:00
8a9c33b407
Renamed Docker{} to Runtime{} for clarity
...
Upstream-commit: b8547f31e4ba5d4381c572e7efa4bea3ccb80515
Component: engine
2013-03-21 00:41:15 -07:00
3f5ac0b977
Simplified the core container API, ported it to the new graph. Some features are missing eg. image 'paths' and tags
...
Upstream-commit: 7c57a4cfc086b4af68ed9ec7c1b03b934db61f0c
Component: engine
2013-03-21 00:25:00 -07:00
35529bba2c
Put back the github.com path for the import
...
Upstream-commit: 453d49573c91a1c49ffbc54d040145804e38d91e
Component: engine
2013-03-12 11:59:27 -07:00
d6cad8aba4
Merge master within fs
...
Upstream-commit: 150a4fe7e5aaa5d733130e22eac09cb36ffadd82
Component: engine
2013-03-12 08:33:21 -07:00
22687838eb
gofmt
...
Upstream-commit: 45a8bba15e95b789c12a371036aa1ad42357dc08
Component: engine
2013-03-12 05:36:37 -07:00
aee1baf2e0
Add "nuke" function to docker tests to avoid disk space waste
...
Upstream-commit: e0b09d4933a289da01508039995bd627ff1392df
Component: engine
2013-03-12 00:08:41 -07:00
5aded53217
Renamed Container property Ram to Memory before it is too late
...
Upstream-commit: 948961831ab6cfb0c94e1e80552f4438d1f434a7
Component: engine
2013-03-11 19:25:02 -07:00
934119dc91
Added support for RamSwap in the generated LXC config (to limit the swap and have the right default settings)
...
Upstream-commit: 75d04a5a7561cabba0aaf2875ef4479381096f91
Component: engine
2013-03-11 17:40:54 -07:00
a52c532fef
Fix a bug which caused dockerd to crash at startup if a container didn't have a registered mountpoint
...
Upstream-commit: 2548722dae1be15c61ee8db1a5eaa1d04ba7fcef
Component: engine
2013-03-11 17:05:01 -07:00
c28aedcbf3
Change relative paths to absolute
...
Upstream-commit: 687d6f25eeb8f4bc505dc9c6c0d9ea305c824e2d
Component: engine
2013-03-11 02:59:52 -07:00
3720d832c1
post-merge repairs
...
Upstream-commit: 5d6199b9251261216cb096cd919e3cc5eb3efdd6
Component: engine
2013-03-11 07:39:06 -07:00
7c2c4d6c33
Merged upstream changes in fs branch
...
Upstream-commit: 2441edf1a39ad75708292bcc2726184b16fb89b2
Component: engine
2013-03-11 05:50:09 -07:00
347532ed43
Merged master branch into fs
...
Upstream-commit: 97a8209438dcc60395b244c14f4efced583eb364
Component: engine
2013-03-11 05:42:36 -07:00
f836da6c3f
Fixed a bug which caused docker to crash at startup while restoring existing containers
...
Upstream-commit: 4474cd5677751ee5acac0525953eea583f797a1b
Component: engine
2013-03-09 19:49:09 -08:00
279f7946e3
gofmt
...
Upstream-commit: c59fff422fdc61c1c994b44fd83e4173a2f0530a
Component: engine
2013-03-09 19:44:09 -08:00
44192a1329
Plugged in image store in front-end (some commands are deactivated right now, will progressively reintroduce them
...
Upstream-commit: 93ba6dd82bb62dbb9cac729cfa6626c469a87d00
Component: engine
2013-03-08 10:48:22 -08:00
4ec7273fca
Container logs are persisted on disk
...
Upstream-commit: 2df0bc6bc0df53c7657404a92fb8f256b7109de0
Component: engine
2013-03-06 16:08:44 -08:00
65fd63e26d
Container can now take a list of ports to expose in its config
...
Upstream-commit: 09eacdfadec36f79cec74f037484b10ddfae6791
Component: engine
2013-02-28 11:51:14 -08:00
4c53a7568f
Halfway through fs branch fixes, TestUser not passing
...
Upstream-commit: 2ebf3464a1ed5bf32e33eff45cfa8e8394b5cd43
Component: engine
2013-02-26 17:45:46 -08:00
