Update to 20.0.3 - make build code more generic

.github/workflows/test.yml

@@ -8,11 +8,19 @@ on:
 jobs:
     check-update:
         runs-on: ubuntu-latest
+
         steps:
-            - uses: actions/checkout@v3
-            - run: |
-                ./update.sh
-                git diff --exit-code
+        - name: Checkout code
+          uses: actions/checkout@v3
+
+        - name: Test the update was run, files will differ if not
+          run: |
+            ./update.sh
+            git diff --exit-code
+
+        - name: Display error message on failure
+          if: failure()  # This condition ensures the step runs only if the previous step failed
+          run: echo "The diff after running the update.sh shows that the update.sh was not run before commiting the PR."
 
     check-build:
         runs-on: ubuntu-latest

README.md

@@ -9,15 +9,9 @@ Dolibarr is a modern software package to manage your organization's activity (co
 
 ## Available versions/tags on Docker
 
-* 15.0.3-php7.4 15.0.3 15
-* 16.0.5-php8.1 16.0.5 16
-* 17.0.4-php8.1 17.0.4 17
-* 18.0.6-php8.1 18.0.6 18
-* 19.0.4-php8.2 19.0.4 19
-* 20.0.2-php8.2 20.0.2 20 latest
-* develop
+See https://hub.docker.com/repository/docker/dolibarr/dolibarr/tags
 
-*Dolibarr versions 14 and lower are no more updated on docker hub. You can get them as standard zip package from Dolibarr official web site*
+*Very old Dolibarr versions may not be updated on docker hub, but you can always get them as standard zip package from Dolibarr official web site*
 
 
 ## Supported architectures
@@ -193,7 +187,10 @@ Environment variables that are compatible with docker secrets:
 * `DOLI_INSTANCE_UNIQUE_ID` => `DOLI_INSTANCE_UNIQUE_ID_FILE`
 
 
-## Add post-deployment and before starting scripts
+
+## Advnced setup
+
+### Add post-deployment and before starting scripts
 
 It is possible to execute `*.sh`, `*.sql` and/or `*.php` custom files at the end of a deployment or before starting Apache by mounting volumes.
 For scripts to execute during deployment, mount volume in `/var/www/scripts/docker-init.d`.
@@ -206,6 +203,7 @@ For scripts to execute before Apache start, mount volume in `/var/www/scripts/be
 ```
 
 Mount the volumes with compose file : 
+
 ```yaml
 services:
     mariadb:
@@ -243,7 +241,43 @@ services:
 ```
 
 
-## Early support for PostgreSQL
+### Tuning the apache configuration to suit you
+
+#### ServerName
+
+If you run apache2ctl configtest inside the container you'll probably get a message like this:
+> AH00558: apache2: Could not reliably determine the server's fully qualified domain name, using x.y.z.w Set the 'ServerName' directive globally to suppress this message
+
+Easy fix, create a single text file
+
+Contents: "ServerName dolibarr.example.com"
+
+Mountpoint: "/etc/apache2/conf-enabled/servername.conf"
+
+read-only: Yes, mount it read only with :ro 
+
+#### Running your dolibarr behind a proxy?
+
+If you want Dolibarr or the logs from the dolibarr container to reveal the original IP address and not just the proxy's IP address you should create 2 text files:
+
+*remoteip.load*
+This file will load the apache module remoteip https://httpd.apache.org/docs/current/mod/mod_remoteip.html
+
+Contents: "LoadModule remoteip_module /usr/lib/apache2/modules/mod_remoteip.so"
+
+Mountpoint: "/etc/apache2/mods-enabled/remoteip.load"
+
+read-only: Yes, mount it read only with :ro 
+
+*remoteip.conf*
+This file will contain the configuration for remoteip and should also be bind mounted read-only inside the container. Content will depend on your proxy and which kind of header it uses. You may perhaps also enable the proxy protocol, read more at https://httpd.apache.org/docs/current/mod/mod_remoteip.html
+
+Example content: "RemoteIPHeader X-Forwarded-For"
+
+Mountpoint: "/etc/apache2/mods-enabled/remoteip.conf"
+
+
+### Support for PostgreSQL
 
 Setting `DOLI_DB_TYPE` to `pgsql` enable Dolibarr to run with a PostgreSQL database.
 When set to use `pgsql`, Dolibarr must be installed manually on it's first execution:
@@ -262,4 +296,3 @@ When setup this way, to upgrade version the use of the web interface is mandator
 
 If you get error "urllib3.exceptions.URLSchemeUnknown: Not supported URL scheme http+docker" during docker-compose, try to upgrade or downgrade the pip package:
 pip install requests==2.31.0
-

images/20.0.2-php8.2/Dockerfile → images/20.0.3-php8.2/Dockerfile

@@ -9,7 +9,7 @@ FROM ${ARCH}php:8.2-apache-bullseye
 # 2024 Laurent Destailleur
 LABEL maintainer="The Dolibarr foundation <[email protected]>"
 
-ENV DOLI_VERSION 20.0.2
+ENV DOLI_VERSION 20.0.3
 ENV DOLI_VERSION_FOR_INIT_DEMO 20.0
 ENV DOLI_INSTALL_AUTO 1
 ENV DOLI_PROD 1

update.sh

@@ -111,6 +111,3 @@ done
 if [ -f "/tmp/tmp-README.md" ]; then
 	mv "/tmp/tmp-README.md" "${BASE_DIR}/images/README.md"
 fi
-
-
-sed 's/%TAGS%/'"${tags}"'/' "${BASE_DIR}/README.template" > "${BASE_DIR}/README.md"

versions.sh

@@ -3,10 +3,10 @@
 set -e
 
 # The list of version to build docker packages for
-DOLIBARR_VERSIONS=("15.0.3" "16.0.5" "17.0.4" "18.0.6" "19.0.4" "20.0.2" "develop")
+DOLIBARR_VERSIONS=("15.0.3" "16.0.5" "17.0.4" "18.0.6" "19.0.4" "20.0.3" "develop")
 
 # The version to use when installing dolibarr/dolibarr:latest
-DOLIBARR_LATEST_TAG="20.0.2"
+DOLIBARR_LATEST_TAG="20.0.3"
 
 # The version to use to find the dump file for the init of demo with branch "develop"
 DOLIBARR_VERSION_FOR_INIT_DEMO="20.0"