From 6f7c494d14a8c4bc957642f6fe80443a047f12e2 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 6 Aug 2024 15:49:54 +0200
Subject: [PATCH 1/3] Bump dolibarr version to 19.0.2

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

diff --git a/Dockerfile b/Dockerfile
index b31ed89..da8c9e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-apache-buster
+FROM php:8.1-apache-bookworm
 # FROM php:7.4-apache-buster
 MAINTAINER Glenn ROLLAND <glenux@glenux.net>
 
@@ -35,7 +35,7 @@ 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=19.0.1
+ENV DOLIBARR_VERSION=19.0.2
 # ENV DOLIBARR_VERSION=18.0.4
 # ENV DOLIBARR_VERSION=17.0.2
 # ENV DOLIBARR_VERSION=16.0.4

From e7108f75ff0ef5c5c00808668888e36b72327305 Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 6 Aug 2024 16:01:21 +0200
Subject: [PATCH 2/3] fix: avoid timeout during install (php + httpd)

---
 Dockerfile      | 9 +++++----
 php-uploads.ini | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index da8c9e3..d3df585 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,10 +57,11 @@ WORKDIR /var/www/html
 #  && mv composer.json.disabled composer.json \
 #  && composer install
 
-RUN sed \
-  -i 's|/var/www/html|/var/www/html/htdocs|' \
-  /etc/apache2/sites-enabled/000-default.conf
-
+# Fix configuration
+RUN sed -i 's|/var/www/html|/var/www/html/htdocs|' \
+      /etc/apache2/sites-enabled/000-default.conf \
+ && sed -i 's|^Timeout .*|Timeout 1200|' \
+      /etc/apache2/apache2.conf
 
 CMD ["apache2-foreground"]
 
diff --git a/php-uploads.ini b/php-uploads.ini
index 4ba1ed2..c60e710 100644
--- a/php-uploads.ini
+++ b/php-uploads.ini
@@ -1,5 +1,5 @@
 file_uploads = On
 upload_max_filesize = 128M
 post_max_size = 128M
-max_execution_time = 600
+max_execution_time = 1200
 max_input_time = 120 

From 4fbf104d7438b54442b4edf20b6e054aa69e856b Mon Sep 17 00:00:00 2001
From: Glenn <glenux@glenux.net>
Date: Tue, 6 Aug 2024 16:12:01 +0200
Subject: [PATCH 3/3] cicd: fix build naming

---
 .drone.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 80087de..94d336c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -40,9 +40,11 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-dolibarr:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-dolibarr:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-dolibarr
-      tags: "latest_${DRONE_BRANCH/\\//-}"
+      tags:
+        - "${DRONE_BRANCH/\\//-}_latest"
+        - "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
       purge: false
     when:
       branch:
@@ -57,7 +59,7 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-dolibarr:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-dolibarr:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-dolibarr
       tags: latest
       purge: false