Commit Graph

34 Commits

Author SHA1 Message Date
2ad8a6ba47 Add README.md file for sysinit directory
Note, this text is just copied from sysinit.go

See Issue #5873

Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: f9728de7a3a5bca5db800edf17d8bc3b39358b77
Component: engine
2014-05-17 18:12:44 +00:00
f7be50364d Rename runtime/* to daemon/*
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
2014-04-17 14:43:01 -07:00
68860e9695 Move execdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: af385151ceedde097eda8a5195b431e8076cf76b
Component: engine
2014-03-17 11:40:12 -07:00
1cf50c0291 Move .dockerenv parsing to lxc driver
This is not needed for e.g. the native driver

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 636959e20ae368e470a5c2420aae4528245b2cf6
Component: engine
2014-03-13 20:01:29 +01:00
0cd1a2f6a4 Move container.json and pid file into a root specific driver dir
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 96e33a7646b3669632f48ed1071aeb61b8016be1
Component: engine
2014-02-25 12:41:31 -08:00
084de3d869 Remove setup logging from sysinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a64ebabdfaca66709d664cb87a35d689e35cfd0d
Component: engine
2014-02-24 21:54:37 -08:00
530d80759d Fix exec driver flag, rename new driver to 'native'
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d59c05a37c3e964cdeef818afc2e7c3a3e8d0cf1
Component: engine
2014-02-24 20:41:09 -08:00
4d05a25973 Remove chroot driver, it's not needed
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ca537a63a8a21eb4d5d31144c934ca18846bb856
Component: engine
2014-02-24 18:52:48 -08:00
79f89aac0a Use the dockerenv file from the current dir instead of root
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: e84e344b1f887f06852953bc75912fc24a64d08a
Component: engine
2014-02-24 17:02:46 -08:00
07cc777e62 Fix tests with dockerinit lookup path
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 01f9815b55742654b2f35d13c3aba6a9e48634c7
Component: engine
2014-02-24 13:40:17 -08:00
54e2291890 Compile nsinit into docker for use with dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8f20058307cb30c9697b8dbee1c7bf2b1e0ba766
Component: engine
2014-02-24 12:21:13 -08:00
a7d9996138 Cleanup some statements from exec driver work
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9e3da87a3a6fea21194ceb9dbd30a39d043a48a4
Component: engine
2014-02-14 17:28:50 -08:00
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
96611d5300 Make sure drivers are registerd within sysinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 97c84507054a7379c8f8b461773b9c8d4972902b
Component: engine
2014-01-17 17:42:58 -08:00
d65bec8d4a Small fixes to type names
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ca8dd73fbfa7aca0768278ff1ff9671f80c48138
Component: engine
2014-01-17 17:42:22 -08:00
ab79ba703f Move docker init into drivers functions
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: f7684ea7f61c0c69033c27605e9ad9a0a76e74cd
Component: engine
2014-01-17 17:42:22 -08:00
99f003c9e7 Make sure proc is umounted for chroot driver within init
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d3bae131d6fa10dd1c25077204bf2c3274a3b8cc
Component: engine
2014-01-17 17:42:22 -08:00
653b7f7ad7 Improve chroot driver by mounting proc
Add -driver flag to dockerinit

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 92e6db7beba8ad58e425119cc9885c355a5755e7
Component: engine
2014-01-17 17:42:22 -08:00
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
4679c4e1e7 Return error and not panic when cannot exec in dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 11ef2f0db46b8507007c740300fbf486934aa996
Component: engine
2014-01-16 18:31:21 -08:00
e7204ea88e Move utility package 'netlink' to pkg/netlink
Upstream-commit: f6b91262a77b2e70da8572850dd8b56d92384dfe
Component: engine
2013-12-23 23:39:39 +00:00
0bf2305d2f Move MTU setting outside of lxc and set with netlink
Upstream-commit: 0e6f0c4e02f4a29a1495f68f8aa52c5a10f587da
Component: engine
2013-12-19 11:51:44 -08:00
f609f65b61 Fix OSX build for sysinit
Upstream-commit: 73a1ef7c22f5cde9db5e1292f1340885bf28e807
Component: engine
2013-12-18 10:16:48 -08:00
1beb5ed6c0 Merge pull request #3201 from jpoimboe/libvirt-prereq-network
Set hostname and IP address from dockerinit
Upstream-commit: f9328ad9cc5ecf2b1fcbf0c5b181907141149e4f
Component: engine
2013-12-13 10:38:17 -08:00
8538072ed6 dockerinit: propagate "container" env variable from lxc
Lxc (and libvirt) already set the "container" env variable
appropriately[1], so just use that.

[1] http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
Upstream-commit: e8772943215fff3e17642ad410e4815e40e96b8b
Component: engine
2013-12-12 20:08:58 -06:00
bfaa130f9b dockerinit: set IP address
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
Upstream-commit: ecc51cd465da56b38190fe852cf9f31bdfbb0fdc
Component: engine
2013-12-12 19:57:11 -06:00
50a1369b02 dockerinit: set hostname
Set the hostname in dockerinit instead of with lxc utils.  libvirt-lxc
doesn't have a way to do this, so do it in a common place.
Upstream-commit: f7c7f7978cf0ca94da5cc68ec2634b5a22ae329c
Component: engine
2013-12-12 19:56:05 -06:00
161e9b78f9 dockerinit: drop capabilities
Drop capabilities in dockerinit instead of with lxc utils, since
libvirt-lxc doesn't support it.

This will also be needed for machine container mode, since dockerinit
needs CAP_SYS_ADMIN to setup /dev/console correctly.
Upstream-commit: b8f1c7370516a4eec0d3168d594a7d7d92e7f8e9
Component: engine
2013-12-12 13:47:24 -06:00
a0c18beb35 dockerinit: refactor error handling
Upstream-commit: 1572989201cc54dc87d961fe9c5d6850c61d47b9
Component: engine
2013-12-12 13:47:24 -06:00
22678e4bed dockerinit: put args in a struct
Upstream-commit: bd02d6e662fdf197665a92663854c629c4dda747
Component: engine
2013-12-12 13:47:23 -06:00
67465c23f0 Fixed problem with variables containing \n.
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
Upstream-commit: 1c3a674444c6a6f08ea5ce3812046a00678e4a29
Component: engine
2013-10-31 01:19:32 +01:00
303967e843 Set environment variables using a file.
Upstream-commit: be7eb4bfcb09e17a2c45179bab268ba15050cb6a
Component: engine
2013-10-31 00:48:12 +01:00
576fafed48 Rename all cases of "docker-init" to "dockerinit" for consistency
Upstream-commit: cf86e2bb226c82a991eb392e426e707cf8193c03
Component: engine
2013-10-25 15:13:25 -07:00
69a28976c0 Move SysInit to a submodule
This allows docker-init to not import the main docker
module, which means it won't e.g. pick up any sqlite
dependencies.
Upstream-commit: db999667245926569b161747eed7e08b2ec1c34c
Component: engine
2013-10-25 15:13:24 -07:00