From 66e04002a2e115cbf6f05704c8d8a96f66f73ad4 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 20 Jan 2022 14:14:08 +0200
Subject: [PATCH] Moves user check into Apache usecase.

---
 3.10/php7.3/apache/docker-entrypoint.sh     | 27 +++++++++++----------
 3.10/php7.3/fpm-alpine/docker-entrypoint.sh | 27 +++++++++++----------
 3.10/php7.3/fpm/docker-entrypoint.sh        | 27 +++++++++++----------
 3.10/php7.4/apache/docker-entrypoint.sh     | 27 +++++++++++----------
 3.10/php7.4/fpm-alpine/docker-entrypoint.sh | 27 +++++++++++----------
 3.10/php7.4/fpm/docker-entrypoint.sh        | 27 +++++++++++----------
 4.0/php7.4/apache/docker-entrypoint.sh      | 27 +++++++++++----------
 4.0/php7.4/fpm-alpine/docker-entrypoint.sh  | 27 +++++++++++----------
 4.0/php7.4/fpm/docker-entrypoint.sh         | 27 +++++++++++----------
 4.0/php8.0/apache/docker-entrypoint.sh      | 27 +++++++++++----------
 4.0/php8.0/fpm-alpine/docker-entrypoint.sh  | 27 +++++++++++----------
 4.0/php8.0/fpm/docker-entrypoint.sh         | 27 +++++++++++----------
 docker-entrypoint.sh                        | 27 +++++++++++----------
 13 files changed, 182 insertions(+), 169 deletions(-)

diff --git a/3.10/php7.3/apache/docker-entrypoint.sh b/3.10/php7.3/apache/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/3.10/php7.3/apache/docker-entrypoint.sh
+++ b/3.10/php7.3/apache/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/3.10/php7.3/fpm-alpine/docker-entrypoint.sh b/3.10/php7.3/fpm-alpine/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/3.10/php7.3/fpm-alpine/docker-entrypoint.sh
+++ b/3.10/php7.3/fpm-alpine/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/3.10/php7.3/fpm/docker-entrypoint.sh b/3.10/php7.3/fpm/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/3.10/php7.3/fpm/docker-entrypoint.sh
+++ b/3.10/php7.3/fpm/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/3.10/php7.4/apache/docker-entrypoint.sh b/3.10/php7.4/apache/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/3.10/php7.4/apache/docker-entrypoint.sh
+++ b/3.10/php7.4/apache/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/3.10/php7.4/fpm-alpine/docker-entrypoint.sh b/3.10/php7.4/fpm-alpine/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/3.10/php7.4/fpm-alpine/docker-entrypoint.sh
+++ b/3.10/php7.4/fpm-alpine/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/3.10/php7.4/fpm/docker-entrypoint.sh b/3.10/php7.4/fpm/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/3.10/php7.4/fpm/docker-entrypoint.sh
+++ b/3.10/php7.4/fpm/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/4.0/php7.4/apache/docker-entrypoint.sh b/4.0/php7.4/apache/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/4.0/php7.4/apache/docker-entrypoint.sh
+++ b/4.0/php7.4/apache/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/4.0/php7.4/fpm-alpine/docker-entrypoint.sh b/4.0/php7.4/fpm-alpine/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/4.0/php7.4/fpm-alpine/docker-entrypoint.sh
+++ b/4.0/php7.4/fpm-alpine/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/4.0/php7.4/fpm/docker-entrypoint.sh b/4.0/php7.4/fpm/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/4.0/php7.4/fpm/docker-entrypoint.sh
+++ b/4.0/php7.4/fpm/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/4.0/php8.0/apache/docker-entrypoint.sh b/4.0/php8.0/apache/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/4.0/php8.0/apache/docker-entrypoint.sh
+++ b/4.0/php8.0/apache/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/4.0/php8.0/fpm-alpine/docker-entrypoint.sh b/4.0/php8.0/fpm-alpine/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/4.0/php8.0/fpm-alpine/docker-entrypoint.sh
+++ b/4.0/php8.0/fpm-alpine/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/4.0/php8.0/fpm/docker-entrypoint.sh b/4.0/php8.0/fpm/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/4.0/php8.0/fpm/docker-entrypoint.sh
+++ b/4.0/php8.0/fpm/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index f65dee8..26346ea 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -18,6 +18,20 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                         pound='#'
                         user="${user#$pound}"
                         group="${group#$pound}"
+
+                        # set user if not exist
+                        if ! id "$user" &>/dev/null; then
+                                # get the user name
+                                : "${USER_NAME:=www-data}"
+                                # change the user name
+                                [[ "$USER_NAME" != "www-data" ]] &&
+                                        usermod -l "$USER_NAME" www-data &&
+                                        groupmod -n "$USER_NAME" www-data
+                                # update the user ID
+                                groupmod -o -g "$user" "$USER_NAME"
+                                # update the user-group ID
+                                usermod -o -u "$group" "$USER_NAME"
+                        fi
                         ;;
                 *) # php-fpm
                         user='www-data'
@@ -28,19 +42,6 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
                 user="$uid"
                 group="$gid"
         fi
-        # set user if not exist
-        if ! id "$user" &>/dev/null; then
-                # get the user name
-                : "${USER_NAME:=www-data}"
-                # change the user name
-                [[ "$USER_NAME" != "www-data" ]] &&
-                        usermod -l "$USER_NAME" www-data &&
-                        groupmod -n "$USER_NAME" www-data
-                # update the user ID
-                groupmod -o -g "$user" "$USER_NAME"
-                # update the user-group ID
-                usermod -o -u "$group" "$USER_NAME"
-        fi
 
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then