From 55e2bf05aeccdaa46412e9c92324155aa58540e5 Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 10 Dec 2024 16:30:27 +0100 Subject: [PATCH] Bump PHP version of test container --- .../workflows/build-push-test-docker-image.yml | 2 +- docker/Dockerfile.test | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-push-test-docker-image.yml b/.github/workflows/build-push-test-docker-image.yml index baddfa5fc..ca641ef79 100644 --- a/.github/workflows/build-push-test-docker-image.yml +++ b/.github/workflows/build-push-test-docker-image.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 - name: Build the app - uses: openconext/build-and-publish-test-container/php72-node14@main + uses: openconext/build-and-publish-test-container/php82-node20@main with: use_yarn: true diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index 9795ee0e4..480897c5b 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -1,8 +1,12 @@ -FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest +FROM busybox AS unpack +WORKDIR /unpack +COPY output.zip /unpack +RUN unzip /unpack/output.zip + +FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest +# Set the default workdir WORKDIR /var/www/html -ARG APP_VERSION -ENV GATEWAY_VERSION=$APP_VERSION -ADD output.tar /var/www/html/ +COPY --from=unpack /unpack/ /var/www/html/ # Add the application configuration files COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml COPY config/openconext/samlstepupproviders_parameters.yaml.dist config/openconext/samlstepupproviders_parameters.yaml @@ -10,7 +14,9 @@ COPY config/openconext/samlstepupproviders_parameters.yaml.dist config/openconex # Add the config files for Apache2 RUN rm -rf /etc/apache2/sites-enabled/* COPY ./docker/conf/gateway-apache2.conf /etc/apache2/sites-enabled/gateway.conf -RUN bin/console --env=test cache:clear -RUN rm -rf /var/www/html/var/cache/test && chown -R www-data /var/www/html/var +RUN rm -rf /var/www/html/var/cache/prod &&\ + mkdir -p /var/www/html/var/cache &&\ + chown -R www-data /var/www/html/var +EXPOSE 80 CMD ["apache2-foreground"]