Merge branch 'drone/enable-build-base-image'

This commit is contained in:
Julien Fastré 2022-06-07 11:44:43 +02:00
commit fb3b2744d5
2 changed files with 3 additions and 3 deletions

View File

@ -2,11 +2,11 @@
kind: pipeline kind: pipeline
type: docker type: docker
name: build-base-image name: build-base-image
image_pull_secrets:
- dockerconfig
trigger: trigger:
event: event:
- cron - cron
- push
cron: cron:
- base-image - base-image

View File

@ -44,6 +44,7 @@ RUN { \
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
ENV COMPOSER_ALLOW_SUPERUSER=1 ENV COMPOSER_ALLOW_SUPERUSER=1
ENV COMPOSER_MEMORY_LIMIT=-1 ENV COMPOSER_MEMORY_LIMIT=-1
ENV COMPOSER_HOME=/var/www/app/.composer
WORKDIR /var/www/app WORKDIR /var/www/app
@ -76,7 +77,6 @@ ENTRYPOINT ["/entrypoint.sh"]
ENV PHP_FPM_USER=www-data \ ENV PHP_FPM_USER=www-data \
PHP_FPM_GROUP=www-data \ PHP_FPM_GROUP=www-data \
COMPOSER_HOME=/var/www/app/.composer \
SESSION_LIFETIME=10800 SESSION_LIFETIME=10800
CMD [ "php-fpm" ] CMD [ "php-fpm" ]