From 2ec22baed9224a47664ccbd7bf17c839e6c5ff2f Mon Sep 17 00:00:00 2001
From: Daniel Hansson <daniel@techandme.se>
Date: Fri, 2 Jun 2017 17:58:04 +0200
Subject: [PATCH] update docker before Nextcloud

---
 nextcloud_update.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nextcloud_update.sh b/nextcloud_update.sh
index 1bb0c130..d957894f 100644
--- a/nextcloud_update.sh
+++ b/nextcloud_update.sh
@@ -44,6 +44,19 @@ then
     service apache2 restart
 fi
 
+# Update docker images
+if [ "$(docker image inspect onlyoffice/documentserver >/dev/null 2>&1 && echo yes || echo no)" == "yes" ]
+then
+    echo "Updating Docker container for OnlyOffice..."
+    echo "docker pull onlyoffice/documentserver"
+fi
+
+if [ "$(docker image inspect collabora/code >/dev/null 2>&1 && echo yes || echo no)" == "yes" ]
+then
+    echo "Updating Docker container for Collabora..."
+    echo "docker pull collabora/code"
+fi
+
 # Cleanup un-used packages
 apt autoremove -y
 apt autoclean
@@ -272,19 +285,6 @@ bash "$SECURE"
 # Repair
 sudo -u www-data php "$NCPATH"/occ maintenance:repair
 
-# Update docker images
-if [ "$(docker image inspect onlyoffice/documentserver >/dev/null 2>&1 && echo yes || echo no)" == "yes" ]
-then
-    echo "Updating Docker container for OnlyOffice..."
-    echo "docker pull onlyoffice/documentserver"
-fi
-
-if [ "$(docker image inspect collabora/code >/dev/null 2>&1 && echo yes || echo no)" == "yes" ]
-then
-    echo "Updating Docker container for Collabora..."
-    echo "docker pull collabora/code"
-fi
-
 CURRENTVERSION_after=$(sudo -u www-data php "$NCPATH"/occ status | grep "versionstring" | awk '{print $3}')
 if [[ "$NCVERSION" == "$CURRENTVERSION_after" ]]
 then