Fix log must not use INIT if not into INIT method

Dolibarr · Dec 11, 2024 · 9d5533c · 9d5533c
1 parent 4d08de2
commit 9d5533c
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 40 deletions.
diff --git a/docker-run.sh b/docker-run.sh
@@ -405,24 +405,26 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
 
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
 
   echo
   echo "*** You can connect to the docker Mariadb with:"

diff --git a/images/15.0.3-php7.4/docker-run.sh b/images/15.0.3-php7.4/docker-run.sh
@@ -405,23 +405,26 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
+
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
 
   echo
   echo "*** You can connect to the docker Mariadb with:"

diff --git a/images/16.0.5-php8.1/docker-run.sh b/images/16.0.5-php8.1/docker-run.sh
@@ -405,24 +405,27 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
 
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
+
   echo
   echo "*** You can connect to the docker Mariadb with:"
   echo "sudo docker exec -it nameofwebcontainer-mariadb-1 bash"

diff --git a/images/17.0.4-php8.1/docker-run.sh b/images/17.0.4-php8.1/docker-run.sh
@@ -405,24 +405,27 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
 
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
+
   echo
   echo "*** You can connect to the docker Mariadb with:"
   echo "sudo docker exec -it nameofwebcontainer-mariadb-1 bash"

diff --git a/images/18.0.6-php8.1/docker-run.sh b/images/18.0.6-php8.1/docker-run.sh
@@ -405,24 +405,27 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
 
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
+
   echo
   echo "*** You can connect to the docker Mariadb with:"
   echo "sudo docker exec -it nameofwebcontainer-mariadb-1 bash"

diff --git a/images/19.0.4-php8.2/docker-run.sh b/images/19.0.4-php8.2/docker-run.sh
@@ -405,24 +405,27 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
 
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
+
   echo
   echo "*** You can connect to the docker Mariadb with:"
   echo "sudo docker exec -it nameofwebcontainer-mariadb-1 bash"

diff --git a/images/20.0.2-php8.2/docker-run.sh b/images/20.0.2-php8.2/docker-run.sh
@@ -405,24 +405,27 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
 
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
+
   echo
   echo "*** You can connect to the docker Mariadb with:"
   echo "sudo docker exec -it nameofwebcontainer-mariadb-1 bash"

diff --git a/images/develop/docker-run.sh b/images/develop/docker-run.sh
@@ -405,24 +405,27 @@ function run()
     fi
   fi
 
-  # Run scripts before starting
-  runScripts "before-starting.d"
-
+  # Set permission
   local CURRENT_UID=$(id -u www-data)
   local CURRENT_GID=$(id -g www-data)
   usermod -u ${WWW_USER_ID} www-data
   groupmod -g ${WWW_GROUP_ID} www-data
 
   if [[ ${CURRENT_UID} -ne ${WWW_USER_ID} || ${CURRENT_GID} -ne ${WWW_GROUP_ID} ]]; then
     # Refresh file ownership cause it has changed
-    echo "[INIT] => As UID / GID have changed from default, update ownership for files in /var/ww ..."
+    echo "As UID / GID have changed from default, update ownership for files in /var/ww ..."
     chown -R www-data:www-data /var/www
   else
     # Reducing load on init : change ownership only for volumes declared in docker
-    echo "[INIT] => update ownership for files in /var/www/documents ..."
+    echo "Update ownership for files in /var/www/documents ..."
     chown -R www-data:www-data /var/www/documents
   fi
 
+
+  # Run scripts before starting
+  runScripts "before-starting.d"
+
+
   echo
   echo "*** You can connect to the docker Mariadb with:"
   echo "sudo docker exec -it nameofwebcontainer-mariadb-1 bash"