From 7413f565c76eb9a3f7890219f5d0a04e0eb4e827 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Aug 2024 13:10:57 +0200
Subject: [PATCH] Prepare v20. Add wget into image.

---
 Dockerfile.template | 2 ++
 docker-run.sh       | 2 +-
 update.sh           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index ef00e96..94d5ce3 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,5 +1,6 @@
 ARG ARCH=
 
+# Use an image like PHP_BASE_IMAGE=x.y-apache-buster
 FROM ${ARCH}php:%PHP_BASE_IMAGE%
 
 LABEL maintainer="Garcia MICHEL <garcia@soamichel.fr>"
@@ -60,6 +61,7 @@ RUN apt-get update -y \
         default-mysql-client \
         postgresql-client \
         cron \
+        wget \        
     && apt-get autoremove -y \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
diff --git a/docker-run.sh b/docker-run.sh
index e46b49a..0718a8e 100755
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -200,7 +200,7 @@ function initializeDatabase()
     mkdir -p /var/www/dev/initdemo/
     versiondemo=`echo "${DOLI_VERSION}" | sed "s/^\([0-9]*\.[0-9]*\).*/\1.0/"`
     echo "Load demo data from file https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql ..."
-    wget https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_INIT_DEMO}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql -o /var/www/dev/initdemo/initdemo.sql
+    wget https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql -o /var/www/dev/initdemo/initdemo.sql
     for fileSQL in /var/www/dev/initdemo/*.sql; do
     	# We exclude the old load file.
         if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then
diff --git a/update.sh b/update.sh
index 0c90930..4a5f0c8 100755
--- a/update.sh
+++ b/update.sh
@@ -27,7 +27,7 @@ for dolibarrVersion in "${DOLIBARR_VERSIONS[@]}"; do
 
   # Mapping version according https://wiki.dolibarr.org/index.php/Versions
   # Regarding PHP Supported version : https://www.php.net/supported-versions.php
-  if [ "${dolibarrVersion}" = "develop" ] || [ "${dolibarrMajor}" -ge "19" ]; then
+  if [ "${dolibarrVersion}" = "develop" ] || [ "${dolibarrMajor}" -ge "19" ] || [ "${dolibarrMajor}" -ge "20" ]; then
     php_base_images=( "8.2-apache-buster" )
   elif [ "${dolibarrMajor}" -ge "16" ]; then
     php_base_images=( "8.1-apache-buster" )