From 70b79811191f1479ef4fc6a307eb122c35011f5a Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Mon, 19 Nov 2018 14:39:57 +0100
Subject: [PATCH] Check for docker
---
upgradeAll.sh | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/upgradeAll.sh b/upgradeAll.sh
index 1c81d5c..53b867d 100644
--- a/upgradeAll.sh
+++ b/upgradeAll.sh
@@ -69,6 +69,14 @@ else
less /var/log/clamav.log
fi
+df -h
+
+# Check docker is running
+if [ ! -z "`echo $MODS | grep -i collabora`" ]
+then
+ docker ps -a
+fi
+
# Restart services
services="`checkrestart | awk '/^service/{print $2} /^systemctl/{print $3}'` \
$EXTRAS_SERVICES_TO_RESTART"
@@ -82,13 +90,6 @@ else
awk '/^[ \t]*(server_name|server_alias)/{gsub(/;$/, "", $2); print "https://"$2}' /etc/nginx/*-enabled/* | sort -u
fi
-# Verify security upgrades are all done
-upgradesremaining=`apt-get -s dist-upgrade |grep "^Inst" |grep -i securi`
-if [ ! -z "$upgradesremaining" ]
-then
- echo "\tSOME SECURITY UPGRADES HAVE NOT BEEN DONE $upgradesremaining"
-fi
-
# Check if reeboot is requird
last_kernel="$(dpkg -l | awk '/linux-image-[0-9]/{print $2}' | sort -rn | head -n 1)"
running_kernel="linux-image-$(uname -r)"
@@ -96,4 +97,11 @@ if [ "$last_kernel" != "$running_kernel" ]
then
echo "Running on an old kernel, reboot required"
fi
-df -h
+
+# Verify security upgrades are all done
+upgradesremaining=`apt-get -s dist-upgrade |grep "^Inst" |grep -i securi`
+if [ ! -z "$upgradesremaining" ]
+then
+ echo "\tSOME SECURITY UPGRADES HAVE NOT BEEN DONE $upgradesremaining"
+fi
+
--
GitLab