From 770a98c85a2eda88bbf0c9089553f9390465305d Mon Sep 17 00:00:00 2001 From: Bart Geesink Date: Thu, 25 Jul 2024 16:15:20 +0200 Subject: [PATCH] Docker: Small fixes before releasing 5.2.0 --- docker/Dockerfile.prod | 11 ++++------- docker/conf/middleware-apache2.conf | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 209dd1b25..95de2852c 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -1,10 +1,10 @@ -FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build +FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest COPY *.tar.bz2 /tmp/ RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \ rm -rf /tmp/*.tar.bz2 +WORKDIR /var/www/html # Add the application configuration files -COPY .env .env COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml @@ -14,12 +14,9 @@ COPY ./docker/conf/middleware-apache2.conf /etc/apache2/sites-enabled/middleware # Recreate the cache directory and set the correct permissions RUN rm -rf /var/www/html/var/cache/prod && \ - mkdir -p /var/www/html/var/cache/prod && \ - chown -R www-data /var/www/html/var + mkdir -p /var/www/html/var/cache/prod && \ + chown -R www-data /var/www/html/var EXPOSE 80 -# Set the default workdir -WORKDIR /var/www/html - CMD ["apache2-foreground"] diff --git a/docker/conf/middleware-apache2.conf b/docker/conf/middleware-apache2.conf index 2aff203fe..3f0eb9271 100644 --- a/docker/conf/middleware-apache2.conf +++ b/docker/conf/middleware-apache2.conf @@ -1,7 +1,7 @@ ServerName middleware ServerAdmin admin@surf.nl - + CustomLog /proc/self/fd/1 stepup DocumentRoot /var/www/html/public SetEnv HTTPS on SetEnv APP_ENV prod