Fix upgrade using upgrade.unlock. Add more logs.

Dockerfile.template

@@ -4,8 +4,9 @@ ARG ARCH=
 FROM ${ARCH}php:%PHP_BASE_IMAGE%
 
 # Credit/Initial maintainer: Garcia MICHEL <[email protected]>
-# Modified according the GPL license by developers of the Dolibarr community.
-#LABEL maintainer="Garcia MICHEL <[email protected]>"
+# Modified according to the GPL license by developers of the Dolibarr community:
+# 2024 Alois Micard 
+# 2024 Laurent Destailleur 
 LABEL maintainer="The Dolibarr foundation <[email protected]>"
 
 ENV DOLI_VERSION %DOLI_VERSION%

docker-compose.yml

@@ -1,11 +1,15 @@
 # This docker-compose.yml file is used to build and test quickly
-# a specific version of Dolibarr
+# a specific version of Dolibarr.
 #
 # Before build, define the variable DOLI_VERSION as following:
-# $ export DOLI_VERSION=4.0.4
+# $ export DOLI_VERSION=19.0.3
 # And then, you can run :
 # $ docker-compose up
 #
+# OR run the script ./test.sh dolversion [phpversion]
+# sudo ./test.sh develop
+# sudo ./test.sh 19.0.3  8.2
+#  
 # More information about Docker-compose : https://docs.docker.com/compose/
 
 networks:
@@ -43,16 +47,16 @@ services:
             - mysql-password
         environment:
             DOLI_CRON: 1
-            DOLI_CRON_KEY: xxxx
-            DOLI_CRON_USER: administrator
-            DOLI_INSTANCE_UNIQUE_ID: xxxx
+            DOLI_CRON_KEY: mycronsecurekey
+            DOLI_CRON_USER: admintest
+            DOLI_INSTANCE_UNIQUE_ID: myinstanceuniqueid
             DOLI_DB_USER_FILE: /run/secrets/mysql-user
             DOLI_DB_PASSWORD_FILE: /run/secrets/mysql-password
             DOLI_ADMIN_LOGIN: admintest
             DOLI_ADMIN_PASSWORD: admintest
             DOLI_DB_HOST: mariadb
             DOLI_DB_NAME: dolibarr
-            DOLI_URL_ROOT: http://0.0.0.0
+            DOLI_URL_ROOT: http://0.0.0.0:81
             WWW_USER_ID: 1000
             WWW_GROUP_ID: 1000
         networks:
@@ -78,8 +82,8 @@ services:
             DOLI_ADMIN_PASSWORD: "admintest"
             DOLI_DB_HOST: mariadb
             DOLI_DB_NAME: dolibarr
-            DOLI_URL_ROOT: 'http://0.0.0.0'
-            DOLI_INSTANCE_UNIQUE_ID: xxxx
+            DOLI_URL_ROOT: 'http://0.0.0.0:81'
+            DOLI_INSTANCE_UNIQUE_ID: myinstanceuniqueid
             WWW_USER_ID: 1000
             WWW_GROUP_ID: 1000
         ports:

images/15.0.3-php7.4/Dockerfile

@@ -4,8 +4,9 @@ ARG ARCH=
 FROM ${ARCH}php:7.4-apache-buster
 
 # Credit/Initial maintainer: Garcia MICHEL <[email protected]>
-# Modified according the GPL license by developers of the Dolibarr community.
-#LABEL maintainer="Garcia MICHEL <[email protected]>"
+# Modified according to the GPL license by developers of the Dolibarr community:
+# 2024 Alois Micard 
+# 2024 Laurent Destailleur 
 LABEL maintainer="The Dolibarr foundation <[email protected]>"
 
 ENV DOLI_VERSION 15.0.3

images/16.0.5-php8.1/Dockerfile

@@ -4,8 +4,9 @@ ARG ARCH=
 FROM ${ARCH}php:8.1-apache-buster
 
 # Credit/Initial maintainer: Garcia MICHEL <[email protected]>
-# Modified according the GPL license by developers of the Dolibarr community.
-#LABEL maintainer="Garcia MICHEL <[email protected]>"
+# Modified according to the GPL license by developers of the Dolibarr community:
+# 2024 Alois Micard 
+# 2024 Laurent Destailleur 
 LABEL maintainer="The Dolibarr foundation <[email protected]>"
 
 ENV DOLI_VERSION 16.0.5

images/17.0.4-php8.1/Dockerfile

@@ -4,8 +4,9 @@ ARG ARCH=
 FROM ${ARCH}php:8.1-apache-buster
 
 # Credit/Initial maintainer: Garcia MICHEL <[email protected]>
-# Modified according the GPL license by developers of the Dolibarr community.
-#LABEL maintainer="Garcia MICHEL <[email protected]>"
+# Modified according to the GPL license by developers of the Dolibarr community:
+# 2024 Alois Micard 
+# 2024 Laurent Destailleur 
 LABEL maintainer="The Dolibarr foundation <[email protected]>"
 
 ENV DOLI_VERSION 17.0.4

images/18.0.5-php8.1/Dockerfile

@@ -4,8 +4,9 @@ ARG ARCH=
 FROM ${ARCH}php:8.1-apache-buster
 
 # Credit/Initial maintainer: Garcia MICHEL <[email protected]>
-# Modified according the GPL license by developers of the Dolibarr community.
-#LABEL maintainer="Garcia MICHEL <[email protected]>"
+# Modified according to the GPL license by developers of the Dolibarr community:
+# 2024 Alois Micard 
+# 2024 Laurent Destailleur 
 LABEL maintainer="The Dolibarr foundation <[email protected]>"
 
 ENV DOLI_VERSION 18.0.5

images/19.0.3-php8.2/Dockerfile

@@ -4,8 +4,9 @@ ARG ARCH=
 FROM ${ARCH}php:8.2-apache-buster
 
 # Credit/Initial maintainer: Garcia MICHEL <[email protected]>
-# Modified according the GPL license by developers of the Dolibarr community.
-#LABEL maintainer="Garcia MICHEL <[email protected]>"
+# Modified according to the GPL license by developers of the Dolibarr community:
+# 2024 Alois Micard 
+# 2024 Laurent Destailleur 
 LABEL maintainer="The Dolibarr foundation <[email protected]>"
 
 ENV DOLI_VERSION 19.0.3