From 5f1de8cc309568c3303f6f7ad07a1607a5a4ebd1 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Mon, 5 Feb 2024 16:08:29 +0100
Subject: [PATCH 1/4] refactor: follow best-practices in Dockerfile

---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3821e33..c123c8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER Glenn ROLLAND <glenux@glenux.net>
 RUN apt-get update \
 	&& apt-cache search lib mysql dev$ \
 	&& apt-get install -y \
-		wget unzip curl \
+		unzip curl \
         libfreetype6-dev \
         libicu-dev \
         libjpeg62-turbo-dev \
@@ -28,9 +28,9 @@ RUN apt-get update \
 	&& docker-php-ext-install imap \
     && docker-php-ext-install zip
 
-ADD php-uploads.ini /usr/local/etc/php/conf.d/glenux-uploads.ini
-ADD php-performance.ini /usr/local/etc/php/conf.d/glenux-performance.ini
-ADD php-errors.ini /usr/local/etc/php/conf.d/glenux-errors.ini
+COPY php-uploads.ini /usr/local/etc/php/conf.d/glenux-uploads.ini
+COPY php-performance.ini /usr/local/etc/php/conf.d/glenux-performance.ini
+COPY php-errors.ini /usr/local/etc/php/conf.d/glenux-errors.ini
 
 RUN curl -sS https://getcomposer.org/installer \
   | php -- --install-dir=/usr/local/bin --filename=composer
@@ -38,8 +38,8 @@ RUN curl -sS https://getcomposer.org/installer \
 ENV DOLIBARR_VERSION=18.0.4
 # ENV DOLIBARR_VERSION=17.0.2
 # ENV DOLIBARR_VERSION=16.0.4
-RUN wget -q \
-  -O /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
+RUN curl -sS \
+  -o /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
   https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip
 
 RUN unzip -q -d /usr/src /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
@@ -59,5 +59,5 @@ RUN sed \
   /etc/apache2/sites-enabled/000-default.conf
 
 
-CMD apache2-foreground
+CMD ["apache2-foreground"]
 
-- 
2.45.2


From a9d934f08ad7d258118da9bec5541baa88bbc8cd Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Mon, 5 Feb 2024 16:23:49 +0100
Subject: [PATCH 2/4] fix: change curl line

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c123c8f..c6d90a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,8 +39,8 @@ ENV DOLIBARR_VERSION=18.0.4
 # ENV DOLIBARR_VERSION=17.0.2
 # ENV DOLIBARR_VERSION=16.0.4
 RUN curl -sS \
-  -o /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
-  https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip
+  https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip \
+  -o /tmp/dolibarr-${DOLIBARR_VERSION}.zip
 
 RUN unzip -q -d /usr/src /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
 	&& chown -R www-data:www-data /usr/src/dolibarr-${DOLIBARR_VERSION} \
-- 
2.45.2


From 70763feb6d16f4b0a6035d62b491b462a2cc0f09 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Sat, 27 Apr 2024 21:39:28 +0000
Subject: [PATCH 3/4] Update Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c6d90a6..3ebc384 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,8 @@ COPY php-errors.ini /usr/local/etc/php/conf.d/glenux-errors.ini
 RUN curl -sS https://getcomposer.org/installer \
   | php -- --install-dir=/usr/local/bin --filename=composer
 
-ENV DOLIBARR_VERSION=18.0.4
+ENV DOLIBARR_VERSION=19.0.1
+# ENV DOLIBARR_VERSION=18.0.4
 # ENV DOLIBARR_VERSION=17.0.2
 # ENV DOLIBARR_VERSION=16.0.4
 RUN curl -sS \
-- 
2.45.2


From 72d5bd938c885c3cf694864fda403220d3b7e375 Mon Sep 17 00:00:00 2001
From: glenux <glenux@glenux.net>
Date: Sat, 27 Apr 2024 22:31:26 +0000
Subject: [PATCH 4/4] Update Dockerfile

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3ebc384..b31ed89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,8 +39,10 @@ ENV DOLIBARR_VERSION=19.0.1
 # ENV DOLIBARR_VERSION=18.0.4
 # ENV DOLIBARR_VERSION=17.0.2
 # ENV DOLIBARR_VERSION=16.0.4
+# https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip
+# https://freefr.dl.sourceforge.net/project/dolibarr/Dolibarr%20ERP-CRM/${DOLIBARR_VERSION}/dolibarr-${DOLIBARR_VERSION}.zip
 RUN curl -sS \
-  https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip \
+  https://freefr.dl.sourceforge.net/project/dolibarr/Dolibarr%20ERP-CRM/${DOLIBARR_VERSION}/dolibarr-${DOLIBARR_VERSION}.zip \
   -o /tmp/dolibarr-${DOLIBARR_VERSION}.zip
 
 RUN unzip -q -d /usr/src /tmp/dolibarr-${DOLIBARR_VERSION}.zip \
-- 
2.45.2