From 5fb0063ef116b84640b24c6f8254dcaf260299ea Mon Sep 17 00:00:00 2001 From: Bart Geesink Date: Fri, 14 Jul 2023 08:32:01 +0200 Subject: [PATCH] Build container on push to this branch --- .github/workflows/build-push-docker-image.yml | 9 ++++++++- docker/Dockerfile.prod | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-push-docker-image.yml b/.github/workflows/build-push-docker-image.yml index 42bfb36..f25fa09 100644 --- a/.github/workflows/build-push-docker-image.yml +++ b/.github/workflows/build-push-docker-image.yml @@ -1,6 +1,13 @@ name: build-push-docker-image -on: workflow_dispatch +on: + push: + branches: + - feature/docker_configs + + workflow_dispatch: + + jobs: build-push-docker-image: diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index a3d54d8..d903427 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -9,7 +9,9 @@ COPY config/packages/parameters.yaml.dist config/packages/parameters.yaml # Add the config files for Apache2 RUN rm -rf /etc/apache2/sites-enabled/* COPY ./docker/conf/apache2.conf /etc/apache2/sites-enabled/apache2.conf -RUN rm -rf /var/www/html/var/cache/prod && chown -R www-data /var/www/html/var +RUN mkdir -p /var/www/html/var && \ + rm -rf /var/www/html/var/cache/prod && \ + chown -R www-data /var/www/html/var # Set the default workdir WORKDIR /var/www/html