.drone.yml

@@ -40,11 +40,9 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-dolibarr:${DRONE_BRANCH/\\//-}_latest"
+      cache_from: "glenux/service-dolibarr:latest_${DRONE_BRANCH/\\//-}"
       repo: glenux/service-dolibarr
-      tags:
+      tags: "latest_${DRONE_BRANCH/\\//-}"
-        - "${DRONE_BRANCH/\\//-}_latest"
-        - "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
       purge: false
     when:
       branch:
@@ -59,7 +57,7 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-dolibarr:${DRONE_BRANCH/\\//-}_latest"
+      cache_from: "glenux/service-dolibarr:latest_${DRONE_BRANCH/\\//-}"
       repo: glenux/service-dolibarr
       tags: latest
       purge: false

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-apache-bookworm
+FROM php:8.1-apache-buster
 # FROM php:7.4-apache-buster
 MAINTAINER Glenn ROLLAND <glenux@glenux.net>
 
@@ -57,11 +57,10 @@ WORKDIR /var/www/html
 #  && mv composer.json.disabled composer.json \
 #  && composer install
 
-# Fix configuration
+RUN sed \
-RUN sed -i 's|/var/www/html|/var/www/html/htdocs|' \
+  -i 's|/var/www/html|/var/www/html/htdocs|' \
-      /etc/apache2/sites-enabled/000-default.conf \
+  /etc/apache2/sites-enabled/000-default.conf
- && sed -i 's|^Timeout .*|Timeout 1200|' \
+
-      /etc/apache2/apache2.conf
 
 CMD ["apache2-foreground"]
 

php-uploads.ini

@@ -1,5 +1,5 @@
 file_uploads = On
 upload_max_filesize = 128M
 post_max_size = 128M
-max_execution_time = 1200
+max_execution_time = 600
 max_input_time = 120