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
a736616ad1
Merge from master
...
Upstream-commit: c7f4602b184ec2cab594dfeaf73bed09aa39a749
Component: engine
2013-02-26 17:32:07 -08:00
3caf4d4dd5
docker wait: block until a container exits, and print its exit code
...
Upstream-commit: ebaa50c4c96a1ba69e480fab5612b5d6a97da145
Component: engine
2013-02-26 11:43:54 -08:00
6bc8a20d54
Integrated the network allocator into Docker. A networking environment
...
is assigned to each container upon Start and released whenever the
container exits.
Upstream-commit: c08f5b2b8460f13f2094bae2a496bf308f7645bb
Component: engine
2013-02-25 14:06:22 -08:00
d2dc806098
Basic networking support with hardcoded addresses. Work in progress.
...
Upstream-commit: 5cecd548cd48cec8967f7ad0b0b42b30fa3ec7a0
Component: engine
2013-02-21 10:47:57 -08:00
966f1c8314
Fixed a bug preventing proper reattachment to stdin upon container restart
...
Upstream-commit: 0da9ccc18e9c30347f394e4cc1231b4b6edca69e
Component: engine
2013-02-13 19:05:57 -08:00
e710d4bb19
Generate LXC config upon start rather than at container creation
...
Upstream-commit: 1793538a68c8fc2c7c85848d375f12f94c9012e5
Component: engine
2013-02-13 18:14:46 -08:00
aaedaa2b20
Implemented support to run as a different user (through the -u flag)
...
Upstream-commit: 6de3e8a22dfa736f88c0477392474d73f7bed3c5
Component: engine
2013-02-13 17:24:35 -08:00
22a81ca759
Implemented a self-injecting process wrapper that runs inside the container
...
- Before starting the container, docker injects itself inside the container by mount binding the dockerd binary into /sbin/init
- Instead of running the user process directly inside the container, we run /sbin/init targetprocess [args...]
- When docker is run as /sbin/init (e.g. argv[0] == "/sbin/init"), then its own sys init code kicks in
- The sys init code will be responsible for setting up the process environment prior to its execution (setuid, networking, ...).
- Finally, docker's sys init will exec() the container's process, thus replacing itself with the target binary (which will be running as pid 1)
Upstream-commit: 58a22942602f9035a1ed44c65ae2c501420600a3
Component: engine
2013-02-13 14:01:44 -08:00
2afd5c1951
Container: Improved pseudo-terminal support
...
Upstream-commit: caea45dd72835926a615ecb36a256172c19f2a36
Component: engine
2013-01-29 15:51:21 -08:00
3297bbd8b6
go fmt
...
Upstream-commit: 94b1cf4be3606ff731b3ca012e5eddf021f4608f
Component: engine
2013-01-29 13:50:27 -08:00
8805019aeb
List containers ordered by creation time
...
Upstream-commit: c7a944caf28d85bd26f4031465e958006a764ac2
Component: engine
2013-01-29 03:24:31 -08:00
870743bf59
'docker run -i' optionally opens stdin. 'docker attach' attaches to a running container (including stdin). 'docker run -t' allocates a tty (still buggy)
...
Upstream-commit: 7a50153c321ff96c16947b3bab9b8e385f2f2a5e
Component: engine
2013-01-28 17:50:12 -08:00
a499fea2e5
go fmt
...
Upstream-commit: 333abbf85a8db9578e34c340032e32de3c8fefe8
Component: engine
2013-01-28 14:30:05 -08:00
0dd4a9f417
Experimenting with a UI which differentiates images and containers
...
Upstream-commit: 904b0ab52b065025acbdba6fdc056ef1dff04d44
Component: engine
2013-01-27 15:42:42 -08:00
cc23af2ae6
Fixed a bug which caused Container.Start() to fail when the rootfs was already mounted.
...
Upstream-commit: fc19a00103f25e4d3bd1102803b32bea299d3fd6
Component: engine
2013-01-27 01:06:02 -08:00
2787997349
Create empty mountpoints (./rw and ./rootfs) every time we create or load a container
...
Upstream-commit: b6fb5bb21b73c90ae1833e32867781824f66ffb7
Component: engine
2013-01-27 00:49:09 -08:00
12fbbf0518
Plugged 4 more commands into the real backend: 'diff', 'reset', 'run', 'stop'. 'run' actually runs the process, but doesn't capture outptu properly, and encounters mount issues
...
Upstream-commit: 5d6dd22fb2d689f98cadba6b7317658331307f3e
Component: engine
2013-01-26 15:56:42 -08:00
001d53c5f0
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: dbc7fb757541260b75ef5a77176b77bb3fd99944
Component: engine
2013-01-25 18:02:56 -08:00
488ccc535c
Fixed a bug preventing containers from running after being restored
...
Upstream-commit: 6513a1d94ed25a5f99b1e3d1670781f7597f9d35
Component: engine
2013-01-25 16:20:34 -08:00
0fdf1beadc
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: fca26254908387b96ed824c16199875955123928
Component: engine
2013-01-25 15:42:43 -08:00
d69e225ffb
container: Fixed a bunch of race conditions by getting rid of lxc-wait.
...
Upstream-commit: f4e25694c15583ed6ed290aff0c29116f7ed361e
Component: engine
2013-01-25 15:36:47 -08:00
10dcbda36f
Container.SetUserData() and GetUserData(): attach optional user data to a container
...
Upstream-commit: 11b65a00c66422a11d114260057384c59f5be4e2
Component: engine
2013-01-25 14:39:02 -08:00
28021d1889
Docker: Fixed an issue with container unmarshaling which prevented
...
docker.restore() to work properly.
Upstream-commit: 2193b0c954e2fc9ce92fefa4e3b5a6c82ae98a3f
Component: engine
2013-01-25 14:09:21 -08:00
f33d685f66
Fixed lxc-wait race condition. Added unit test to try running multiple
...
containers in parallel.
Upstream-commit: f958bdba8a7c1c62f2f6e3e7bc2ddf1599029ecf
Component: engine
2013-01-22 17:30:09 -08:00
47356dc54b
Restart() implementation
...
Upstream-commit: f0c08b57abb6e273b54b3f6d253acfe7b0107972
Component: engine
2013-01-22 15:03:40 -08:00