Skip to content

Commit

Permalink
Docker: Small fixes before releasing 5.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
quartje committed Jul 25, 2024
1 parent 5cc4fed commit 770a98c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
11 changes: 4 additions & 7 deletions docker/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"]
2 changes: 1 addition & 1 deletion docker/conf/middleware-apache2.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Virtualhost *:80>
ServerName middleware
ServerAdmin [email protected]

CustomLog /proc/self/fd/1 stepup
DocumentRoot /var/www/html/public
SetEnv HTTPS on
SetEnv APP_ENV prod
Expand Down

0 comments on commit 770a98c

Please sign in to comment.