Skip to content

Commit

Permalink
Prepare v20. Add wget into image.
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Aug 19, 2024
1 parent 680f1d4 commit 7413f56
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Dockerfile.template
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand Down

0 comments on commit 7413f56

Please sign in to comment.