Skip to content

Commit

Permalink
use lxc exec driver
Browse files Browse the repository at this point in the history
  • Loading branch information
James Horey committed Oct 1, 2014
1 parent 25fd329 commit ab69feb
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions ferry/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,12 @@ def _start_docker_daemon(self, options=None):
# Check if the docker daemon is already running
try:
if not self._docker_running():
bflag = ''
# Use the LXC backend.
lflag = ' -e lxc'

# Figure out which storage backend to use. Right
# now we only support BTRFS or DeviceMapper, since
# AUFS seems to break on some occasions.
if self._is_running_btrfs():
logging.warning("using btrfs backend")
bflag = ' -s btrfs'
Expand All @@ -833,7 +838,7 @@ def _start_docker_daemon(self, options=None):

# We need to fix this so that ICC is set to false.
icc = ' --icc=true'
cmd = 'nohup ' + DOCKER_CMD + ' -d' + ' -H=' + DOCKER_SOCK + ' -g=' + DOCKER_DIR + ' -p=' + DOCKER_PID + dflag + bflag + icc + ' 1>%s 2>&1 &' % DEFAULT_DOCKER_LOG
cmd = 'nohup ' + DOCKER_CMD + ' -d' + ' -H=' + DOCKER_SOCK + ' -g=' + DOCKER_DIR + ' -p=' + DOCKER_PID + dflag + lflag + bflag + icc + ' 1>%s 2>&1 &' % DEFAULT_DOCKER_LOG
logging.warning(cmd)
Popen(cmd, stdout=PIPE, shell=True)

Expand Down

0 comments on commit ab69feb

Please sign in to comment.