From 82aac0bc41472443bd1182e2f1cecea6ae79d794 Mon Sep 17 00:00:00 2001
From: Thomas Nabord <thomas.nabord@prestashop.com>
Date: Thu, 27 Feb 2025 17:41:26 +0100
Subject: [PATCH 1/2] Check new file to get status of shop as settings.inc.php
 is not creqted qnymore on PS v9

---
 base/config_files/docker_run.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/base/config_files/docker_run.sh b/base/config_files/docker_run.sh
index 6ae4c6c7..189f9f95 100755
--- a/base/config_files/docker_run.sh
+++ b/base/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10

From 29452fbed9657e8e681e95af1ed52a252074e792 Mon Sep 17 00:00:00 2001
From: Thomas Nabord <thomas.nabord@prestashop.com>
Date: Thu, 27 Feb 2025 17:50:58 +0100
Subject: [PATCH 2/2] Generate base images

---
 base/images/7.1-apache/config_files/docker_run.sh | 6 +++---
 base/images/7.1-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/7.2-apache/config_files/docker_run.sh | 6 +++---
 base/images/7.2-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/7.3-apache/config_files/docker_run.sh | 6 +++---
 base/images/7.3-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/7.4-apache/config_files/docker_run.sh | 6 +++---
 base/images/7.4-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/8.0-apache/config_files/docker_run.sh | 6 +++---
 base/images/8.0-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/8.1-apache/config_files/docker_run.sh | 6 +++---
 base/images/8.1-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/8.2-apache/config_files/docker_run.sh | 6 +++---
 base/images/8.2-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/8.3-apache/config_files/docker_run.sh | 6 +++---
 base/images/8.3-fpm/config_files/docker_run.sh    | 6 +++---
 base/images/8.4-apache/config_files/docker_run.sh | 6 +++---
 base/images/8.4-fpm/config_files/docker_run.sh    | 6 +++---
 18 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/base/images/7.1-apache/config_files/docker_run.sh b/base/images/7.1-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/7.1-apache/config_files/docker_run.sh
+++ b/base/images/7.1-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/7.1-fpm/config_files/docker_run.sh b/base/images/7.1-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/7.1-fpm/config_files/docker_run.sh
+++ b/base/images/7.1-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/7.2-apache/config_files/docker_run.sh b/base/images/7.2-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/7.2-apache/config_files/docker_run.sh
+++ b/base/images/7.2-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/7.2-fpm/config_files/docker_run.sh b/base/images/7.2-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/7.2-fpm/config_files/docker_run.sh
+++ b/base/images/7.2-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/7.3-apache/config_files/docker_run.sh b/base/images/7.3-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/7.3-apache/config_files/docker_run.sh
+++ b/base/images/7.3-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/7.3-fpm/config_files/docker_run.sh b/base/images/7.3-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/7.3-fpm/config_files/docker_run.sh
+++ b/base/images/7.3-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/7.4-apache/config_files/docker_run.sh b/base/images/7.4-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/7.4-apache/config_files/docker_run.sh
+++ b/base/images/7.4-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/7.4-fpm/config_files/docker_run.sh b/base/images/7.4-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/7.4-fpm/config_files/docker_run.sh
+++ b/base/images/7.4-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.0-apache/config_files/docker_run.sh b/base/images/8.0-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/8.0-apache/config_files/docker_run.sh
+++ b/base/images/8.0-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.0-fpm/config_files/docker_run.sh b/base/images/8.0-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/8.0-fpm/config_files/docker_run.sh
+++ b/base/images/8.0-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.1-apache/config_files/docker_run.sh b/base/images/8.1-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/8.1-apache/config_files/docker_run.sh
+++ b/base/images/8.1-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.1-fpm/config_files/docker_run.sh b/base/images/8.1-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/8.1-fpm/config_files/docker_run.sh
+++ b/base/images/8.1-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.2-apache/config_files/docker_run.sh b/base/images/8.2-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/8.2-apache/config_files/docker_run.sh
+++ b/base/images/8.2-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.2-fpm/config_files/docker_run.sh b/base/images/8.2-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/8.2-fpm/config_files/docker_run.sh
+++ b/base/images/8.2-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.3-apache/config_files/docker_run.sh b/base/images/8.3-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/8.3-apache/config_files/docker_run.sh
+++ b/base/images/8.3-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.3-fpm/config_files/docker_run.sh b/base/images/8.3-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/8.3-fpm/config_files/docker_run.sh
+++ b/base/images/8.3-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.4-apache/config_files/docker_run.sh b/base/images/8.4-apache/config_files/docker_run.sh
index 5256a5a7..8c331fdd 100755
--- a/base/images/8.4-apache/config_files/docker_run.sh
+++ b/base/images/8.4-apache/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10
diff --git a/base/images/8.4-fpm/config_files/docker_run.sh b/base/images/8.4-fpm/config_files/docker_run.sh
index 071b35ac..3c8737ed 100755
--- a/base/images/8.4-fpm/config_files/docker_run.sh
+++ b/base/images/8.4-fpm/config_files/docker_run.sh
@@ -22,7 +22,7 @@ fi
 # From now, stop at error
 set -e
 
-if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
+if [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] &&  [ ! -f ./install.lock ]; then
 
     echo "\n* Setting up install lock file..."
     touch ./install.lock
@@ -113,13 +113,13 @@ if [ ! -f ./config/settings.inc.php ] && [ ! -f ./install.lock ]; then
     echo "\n* Setup completed, removing lock file..."
     rm ./install.lock
 
-elif [ ! -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ ! -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Another setup is currently running..."
     sleep 10
     exit 42
 
-elif [ -f ./config/settings.inc.php ] && [ -f ./install.lock ]; then
+elif [ -f ./config/settings.inc.php ] && [ ! -f ./app/config/parameters.php ] && [ -f ./install.lock ]; then
 
     echo "\n* Shop seems setup but remaining install lock still present..."
     sleep 10