Merge branch 'tuxgasy:master' into master

ekimiateam · Feb 27, 2023 · 1cbb85d · 1cbb85d
2 parents e97291c + 421eb66
commit 1cbb85d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Docker image for Dolibarr with auto installer on first boot.
 * 13.0.4-php7.4 13.0.4 13
 * 14.0.5-php7.4 14.0.5 14
 * 15.0.3-php7.4 15.0.3 15
-* 16.0.3-php8.1 16.0.3 16 latest
+* 16.0.4-php8.1 16.0.4 16 latest
 * develop
 
 **End of support for PHP < 7.4**

diff --git a/examples/with-mysql/docker-compose.yml b/examples/with-mysql/docker-compose.yml
@@ -37,6 +37,7 @@ services:
       MYSQL_DATABASE: "dolibarr"
       MYSQL_USER: "dolibarr"
       MYSQL_PASSWORD: "mysupersecretpasswordfordatabase"
+      MYSQL_ROOT_PASSWORD: "mysupersupersecretpasswordforrootuser"
     volumes:
       - mysql-data:/var/lib/mysql
     networks:

diff --git a/images/16.0.3-php8.1/Dockerfile → images/16.0.4-php8.1/Dockerfile b/images/16.0.3-php8.1/Dockerfile → images/16.0.4-php8.1/Dockerfile
@@ -4,7 +4,7 @@ FROM ${ARCH}php:8.1-apache-buster
 
 LABEL maintainer="Garcia MICHEL <[email protected]>"
 
-ENV DOLI_VERSION 16.0.3
+ENV DOLI_VERSION 16.0.4
 ENV DOLI_INSTALL_AUTO 1
 
 ENV DOLI_DB_TYPE mysqli

diff --git a/images/16.0.3-php8.1/docker-run.sh → images/16.0.4-php8.1/docker-run.sh b/images/16.0.3-php8.1/docker-run.sh → images/16.0.4-php8.1/docker-run.sh
diff --git a/versions.sh b/versions.sh
@@ -2,5 +2,5 @@
 
 set -e
 
-DOLIBARR_VERSIONS=( "11.0.5" "12.0.5" "13.0.4" "14.0.5" "15.0.3" "16.0.3" "develop" )
-DOLIBARR_LATEST_TAG="16.0.3"
+DOLIBARR_VERSIONS=( "11.0.5" "12.0.5" "13.0.4" "14.0.5" "15.0.3" "16.0.4" "develop" )
+DOLIBARR_LATEST_TAG="16.0.4"