From 57ba7611bdda83a12e16858df4eb8842b2eb67d6 Mon Sep 17 00:00:00 2001
From: Robin <robinslot@hotmail.nl>
Date: Mon, 20 Dec 2021 23:56:42 +0100
Subject: [PATCH] Delete user before deleting group

---
 nginx_web/entrypoint.sh | 18 +++++++++---------
 php_fpm/entrypoint.sh   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nginx_web/entrypoint.sh b/nginx_web/entrypoint.sh
index afe3ee2..0cf954e 100644
--- a/nginx_web/entrypoint.sh
+++ b/nginx_web/entrypoint.sh
@@ -1,14 +1,5 @@
 #!/bin/sh
 
-if [ -n "$(getent group "$WWW_DATA_GID")" ]
-then
-    GROUPNAME=$(getent passwd "$WWW_DATA_GID" | cut -d: -f1)
-    echo "Deleting group $GROUPNAME which already uses GID $WWW_DATA_GID"
-    groupdel "$GROUPNAME"
-else
-    echo "GID $WWW_DATA_GID not in use"
-fi
-
 if [ -n "$(getent passwd "$WWW_DATA_UID")" ]
 then
     USERNAME=$(getent passwd "$WWW_DATA_UID" | cut -d: -f1)
@@ -18,6 +9,15 @@ else
     echo "UID $WWW_DATA_UID not in use"
 fi
 
+if [ -n "$(getent group "$WWW_DATA_GID")" ]
+then
+    GROUPNAME=$(getent passwd "$WWW_DATA_GID" | cut -d: -f1)
+    echo "Deleting group $GROUPNAME which already uses GID $WWW_DATA_GID"
+    groupdel "$GROUPNAME"
+else
+    echo "GID $WWW_DATA_GID not in use"
+fi
+
 if [ -n "$(getent group www-data)" ]
 then
     echo "Modifying existing www-data group, setting GID to $WWW_DATA_GID"
diff --git a/php_fpm/entrypoint.sh b/php_fpm/entrypoint.sh
index f4883cf..d38f45b 100644
--- a/php_fpm/entrypoint.sh
+++ b/php_fpm/entrypoint.sh
@@ -1,15 +1,6 @@
 #!/bin/sh
 set -e
 
-if [ -n "$(getent group "$WWW_DATA_GID")" ]
-then
-    GROUPNAME=$(getent passwd "$WWW_DATA_GID" | cut -d: -f1)
-    echo "Deleting group $GROUPNAME which already uses GID $WWW_DATA_GID"
-    groupdel "$GROUPNAME"
-else
-    echo "GID $WWW_DATA_GID not in use"
-fi
-
 if [ -n "$(getent passwd "$WWW_DATA_UID")" ]
 then
     USERNAME=$(getent passwd "$WWW_DATA_UID" | cut -d: -f1)
@@ -19,6 +10,15 @@ else
     echo "UID $WWW_DATA_UID not in use"
 fi
 
+if [ -n "$(getent group "$WWW_DATA_GID")" ]
+then
+    GROUPNAME=$(getent passwd "$WWW_DATA_GID" | cut -d: -f1)
+    echo "Deleting group $GROUPNAME which already uses GID $WWW_DATA_GID"
+    groupdel "$GROUPNAME"
+else
+    echo "GID $WWW_DATA_GID not in use"
+fi
+
 if [ -n "$(getent group www-data)" ]
 then
     echo "Modifying existing www-data group, setting GID to $WWW_DATA_GID"