From feecfcf13020d4fb2cde2e4cf8dacf5142b49bfe Mon Sep 17 00:00:00 2001
From: Daniel Hansson <github@techandme.se>
Date: Sun, 27 May 2018 19:54:20 +0200
Subject: [PATCH] change to overlay2 (#546)

---
 apps/collabora.sh  | 21 +++++----------------
 apps/onlyoffice.sh | 21 +++++----------------
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/apps/collabora.sh b/apps/collabora.sh
index 9c54d886..c214977c 100644
--- a/apps/collabora.sh
+++ b/apps/collabora.sh
@@ -79,22 +79,11 @@ check_open_port 443 "$SUBDOMAIN"
 install_if_not curl
 curl -fsSL get.docker.com | sh
 
-# Load aufs
-# apt-get install linux-image-extra-"$(uname -r)" -y # doesn't exist in Ubuntu 18.04
-install_if_not aufs-tools # already included in the docker-ce package
-AUFS=$(grep -r "aufs" /etc/modules)
-if ! [ "$AUFS" = "aufs" ]
-then
-    echo "aufs" >> /etc/modules
-fi
-
-# Set docker storage driver to AUFS
-AUFS2=$(grep -r "aufs" /etc/default/docker)
-if ! [ "$AUFS2" = 'DOCKER_OPTS="--storage-driver=aufs"' ]
-then
-    echo 'DOCKER_OPTS="--storage-driver=aufs"' >> /etc/default/docker
-    service docker restart
-fi
+# Set devicemapper
+check_command cp -v /lib/systemd/system/docker.service /etc/systemd/system/
+sed -i "s|ExecStart=/usr/bin/dockerd -H fd://|ExecStart=/usr/bin/dockerd --storage-driver=devicemapper -H fd://|g" /etc/systemd/system/docker.service
+systemctl daemon-reload
+systemctl restart docker
 
 # Check of docker runs and kill it
 DOCKERPS=$(docker ps -a -q)
diff --git a/apps/onlyoffice.sh b/apps/onlyoffice.sh
index 81bfe5be..0fe2be78 100644
--- a/apps/onlyoffice.sh
+++ b/apps/onlyoffice.sh
@@ -78,22 +78,11 @@ check_open_port 443 "$SUBDOMAIN"
 install_if_not curl
 curl -fsSL get.docker.com | sh
 
-# Load aufs
-# apt-get install linux-image-extra-"$(uname -r)" -y # doesn't exist in Ubuntu 18.04
-install_if_not aufs-tools # already included in the docker-ce package
-AUFS=$(grep -r "aufs" /etc/modules)
-if ! [ "$AUFS" = "aufs" ]
-then
-    echo "aufs" >> /etc/modules
-fi
-
-# Set docker storage driver to AUFS
-AUFS2=$(grep -r "aufs" /etc/default/docker)
-if ! [ "$AUFS2" = 'DOCKER_OPTS="--storage-driver=aufs"' ]
-then
-    echo 'DOCKER_OPTS="--storage-driver=aufs"' >> /etc/default/docker
-    service docker restart
-fi
+# Set devicemapper
+check_command cp -v /lib/systemd/system/docker.service /etc/systemd/system/
+sed -i "s|ExecStart=/usr/bin/dockerd -H fd://|ExecStart=/usr/bin/dockerd --storage-driver=devicemapper -H fd://|g" /etc/systemd/system/docker.service
+systemctl daemon-reload
+systemctl restart docker
 
 # Check of docker runs and kill it
 DOCKERPS=$(docker ps -a -q)