Merge pull request #1 from Dolibarr/remove-wget

Remove wget dependency
Dolibarr · Aug 20, 2024 · 0e7fff4 · 0e7fff4
2 parents 89d7a42 + 62fa0e6
commit 0e7fff4
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 10 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -61,7 +61,6 @@ 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/README.md b/README.md
@@ -193,6 +193,7 @@ Environment variables that are compatible with docker secrets:
 
 
 ## Add post-deployment and before starting scripts
+
 It is possible to execute `*.sh`, `*.sql` and/or `*.php` custom file at the end of deployment or before starting Apache by mounting volumes.
 For scripts executed during deployment mount volume in `/var/www/scripts/docker-init.d`.
 For scripts executed before Apache stating mount volume in `/var/www/scripts/before-starting.d`.

diff --git a/README.template b/README.template
@@ -64,7 +64,7 @@ services:
             - /home/dolibarr_custom:/var/www/html/custom
 ```
 
-Then build and run all services (-d is to run in background) 
+Then build and run all services (-d is to run in background)
 
 `sudo docker-compose up -d`
 
@@ -96,7 +96,7 @@ Remove the `install.lock` file. The `install.lock` file is located inside the co
 
 `sudo docker exec nameofwebcontainer bash -c "rm -f /var/www/documents/install.lock"`
 
-or 
+or
 
 `sudo docker exec -it nameofwebcontainer bash`
 
@@ -116,6 +116,7 @@ You can still use the standard way to upgrade through web interface.
 
 
 ## Early 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:
  - Browse to `http://0.0.0.0/install`;
@@ -184,7 +185,9 @@ Environment variables that are compatible with docker secrets:
 * `DOLI_CRON_USER` => `DOLI_CRON_USER_FILE`
 * `DOLI_INSTANCE_UNIQUE_ID` => `DOLI_INSTANCE_UNIQUE_ID_FILE`
 
+
 ## Add post-deployment and before starting scripts
+
 It is possible to execute `*.sh`, `*.sql` and/or `*.php` custom file at the end of deployment or before starting Apache by mounting volumes.
 For scripts executed during deployment mount volume in `/var/www/scripts/docker-init.d`.
 For scripts executed before Apache stating mount volume in `/var/www/scripts/before-starting.d`.

diff --git 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_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql -o /var/www/dev/initdemo/initdemo.sql
+    curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.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/images/15.0.3-php7.4/Dockerfile b/images/15.0.3-php7.4/Dockerfile
@@ -1,5 +1,6 @@
 ARG ARCH=
 
+# Use an image like PHP_BASE_IMAGE=x.y-apache-buster
 FROM ${ARCH}php:7.4-apache-buster
 
 LABEL maintainer="Garcia MICHEL <garcia@soamichel.fr>"

diff --git a/images/15.0.3-php7.4/docker-run.sh b/images/15.0.3-php7.4/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
+    curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.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/images/16.0.5-php8.1/Dockerfile b/images/16.0.5-php8.1/Dockerfile
@@ -1,5 +1,6 @@
 ARG ARCH=
 
+# Use an image like PHP_BASE_IMAGE=x.y-apache-buster
 FROM ${ARCH}php:8.1-apache-buster
 
 LABEL maintainer="Garcia MICHEL <garcia@soamichel.fr>"

diff --git a/images/16.0.5-php8.1/docker-run.sh b/images/16.0.5-php8.1/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
+    curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.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/images/17.0.4-php8.1/Dockerfile b/images/17.0.4-php8.1/Dockerfile
@@ -1,5 +1,6 @@
 ARG ARCH=
 
+# Use an image like PHP_BASE_IMAGE=x.y-apache-buster
 FROM ${ARCH}php:8.1-apache-buster
 
 LABEL maintainer="Garcia MICHEL <garcia@soamichel.fr>"

diff --git a/images/17.0.4-php8.1/docker-run.sh b/images/17.0.4-php8.1/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
+    curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.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/images/18.0.5-php8.1/Dockerfile b/images/18.0.5-php8.1/Dockerfile
@@ -1,5 +1,6 @@
 ARG ARCH=
 
+# Use an image like PHP_BASE_IMAGE=x.y-apache-buster
 FROM ${ARCH}php:8.1-apache-buster
 
 LABEL maintainer="Garcia MICHEL <garcia@soamichel.fr>"

diff --git a/images/18.0.5-php8.1/docker-run.sh b/images/18.0.5-php8.1/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
+    curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.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/images/19.0.3-php8.2/Dockerfile b/images/19.0.3-php8.2/Dockerfile
@@ -1,5 +1,6 @@
 ARG ARCH=
 
+# Use an image like PHP_BASE_IMAGE=x.y-apache-buster
 FROM ${ARCH}php:8.2-apache-buster
 
 LABEL maintainer="Garcia MICHEL <garcia@soamichel.fr>"

diff --git a/images/19.0.3-php8.2/docker-run.sh b/images/19.0.3-php8.2/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
+    curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.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/images/develop/Dockerfile b/images/develop/Dockerfile
@@ -1,5 +1,6 @@
 ARG ARCH=
 
+# Use an image like PHP_BASE_IMAGE=x.y-apache-buster
 FROM ${ARCH}php:8.2-apache-buster
 
 LABEL maintainer="Garcia MICHEL <garcia@soamichel.fr>"

diff --git a/images/develop/docker-run.sh b/images/develop/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
+    curl -fLSs -o /var/www/dev/initdemo/initdemo.sql https://raw.githubusercontent.com/Dolibarr/dolibarr/${DOLI_VERSION}/dev/initdemo/mysqldump_dolibarr_$versiondemo.sql
     for fileSQL in /var/www/dev/initdemo/*.sql; do
     	# We exclude the old load file.
         if [[ $fileSQL =~ mysqldump_dolibarr_3.5 ]]; then