From a8e16d0225e2e0a66ec0bd7defecec2f634eea20 Mon Sep 17 00:00:00 2001 From: Suman Chakravartula Date: Tue, 5 Dec 2017 05:14:54 -0800 Subject: [PATCH] move to docker-ce / dockerd. Fixes #1860 --- base-buildout.cfg | 2 +- src/rockstor/scripts/docker_wrapper.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base-buildout.cfg b/base-buildout.cfg index 4b0a89e8d..d23600abc 100644 --- a/base-buildout.cfg +++ b/base-buildout.cfg @@ -61,7 +61,7 @@ command = postgresql-server postgresql-devel kernel-ml btrfs-progs rsync \ nfs-utils avahi netatalk smartmontools net-tools sos hdparm \ postfix cyrus-sasl-plain yum-cron nano usbutils pciutils shellinabox \ - epel-release cryptsetup + epel-release cryptsetup docker-ce [rpm-deps-nut] recipe = plone.recipe.command diff --git a/src/rockstor/scripts/docker_wrapper.py b/src/rockstor/scripts/docker_wrapper.py index 29d7ec3ce..8c772062b 100644 --- a/src/rockstor/scripts/docker_wrapper.py +++ b/src/rockstor/scripts/docker_wrapper.py @@ -21,7 +21,7 @@ from fs.btrfs import mount_share from storageadmin.models import Share -DOCKER = '/usr/bin/docker' +DOCKERD = '/usr/bin/dockerd' def main(): @@ -33,5 +33,5 @@ def main(): except Exception as e: sys.exit('Failed to mount Docker root(%s). Exception: %s' % (mnt_pt, e.__str__())) - run_command([DOCKER, 'daemon', '--log-driver=journald', '-s', - 'btrfs', '-g', mnt_pt]) + run_command([DOCKERD, '--log-driver=journald', '--storage-driver', + 'btrfs', '--data-root', mnt_pt])