Guillaume J. Charmes
73a1ef7c22
Fix OSX build for sysinit
2013-12-18 10:16:48 -08:00
Victor Vieux
f9328ad9cc
Merge pull request #3201 from jpoimboe/libvirt-prereq-network
...
Set hostname and IP address from dockerinit
2013-12-13 10:38:17 -08:00
Josh Poimboeuf
e877294321
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/
2013-12-12 20:08:58 -06:00
Josh Poimboeuf
ecc51cd465
dockerinit: set IP address
...
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
2013-12-12 19:57:11 -06:00
Josh Poimboeuf
f7c7f7978c
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.
2013-12-12 19:56:05 -06:00
Josh Poimboeuf
b8f1c73705
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.
2013-12-12 13:47:24 -06:00
Josh Poimboeuf
1572989201
dockerinit: refactor error handling
2013-12-12 13:47:24 -06:00
Josh Poimboeuf
bd02d6e662
dockerinit: put args in a struct
2013-12-12 13:47:23 -06:00
Brian Olsen
1c3a674444
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.
2013-10-31 01:19:32 +01:00
Brian Olsen
be7eb4bfcb
Set environment variables using a file.
2013-10-31 00:48:12 +01:00
Tianon Gravi
cf86e2bb22
Rename all cases of "docker-init" to "dockerinit" for consistency
2013-10-25 15:13:25 -07:00
Alexander Larsson
db99966724
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.
2013-10-25 15:13:24 -07:00
