develop #4
3 changed files with 12 additions and 9 deletions
|
@ -40,9 +40,11 @@ steps:
|
||||||
from_secret: DOCKERHUB_USERNAME
|
from_secret: DOCKERHUB_USERNAME
|
||||||
password:
|
password:
|
||||||
from_secret: DOCKERHUB_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
|
repo: glenux/service-dolibarr
|
||||||
tags: "latest_${DRONE_BRANCH/\\//-}"
|
tags:
|
||||||
|
- "${DRONE_BRANCH/\\//-}_latest"
|
||||||
|
- "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
|
||||||
purge: false
|
purge: false
|
||||||
when:
|
when:
|
||||||
branch:
|
branch:
|
||||||
|
@ -57,7 +59,7 @@ steps:
|
||||||
from_secret: DOCKERHUB_USERNAME
|
from_secret: DOCKERHUB_USERNAME
|
||||||
password:
|
password:
|
||||||
from_secret: DOCKERHUB_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
|
repo: glenux/service-dolibarr
|
||||||
tags: latest
|
tags: latest
|
||||||
purge: false
|
purge: false
|
||||||
|
|
11
Dockerfile
11
Dockerfile
|
@ -1,4 +1,4 @@
|
||||||
FROM php:8.1-apache-buster
|
FROM php:8.1-apache-bookworm
|
||||||
# FROM php:7.4-apache-buster
|
# FROM php:7.4-apache-buster
|
||||||
MAINTAINER Glenn ROLLAND <glenux@glenux.net>
|
MAINTAINER Glenn ROLLAND <glenux@glenux.net>
|
||||||
|
|
||||||
|
@ -57,10 +57,11 @@ WORKDIR /var/www/html
|
||||||
# && mv composer.json.disabled composer.json \
|
# && mv composer.json.disabled composer.json \
|
||||||
# && composer install
|
# && composer install
|
||||||
|
|
||||||
RUN sed \
|
# Fix configuration
|
||||||
-i 's|/var/www/html|/var/www/html/htdocs|' \
|
RUN sed -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"]
|
CMD ["apache2-foreground"]
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
file_uploads = On
|
file_uploads = On
|
||||||
upload_max_filesize = 128M
|
upload_max_filesize = 128M
|
||||||
post_max_size = 128M
|
post_max_size = 128M
|
||||||
max_execution_time = 600
|
max_execution_time = 1200
|
||||||
max_input_time = 120
|
max_input_time = 120
|
||||||
|
|
Loading…
Reference in a new issue