move to docker-ce / dockerd. Fixes #1860

rockstor · Dec 5, 2017 · a8e16d0 · a8e16d0
1 parent e9422f5
commit a8e16d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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])