From e34fb67e017829bdb51dcd738c206d375791d724 Mon Sep 17 00:00:00 2001 From: Bart Geesink Date: Tue, 12 Dec 2023 13:55:39 +0100 Subject: [PATCH] Docker test: Use busybox image to unzip --- docker/Dockerfile.test | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index 79bef840..61455275 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -1,11 +1,15 @@ +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 -ADD output.zip /var/www/html/ +COPY --from=unpack /unpack/ /var/www/html/ # Add the application configuration files -RUN cp config/openconext/parameters.yaml.dist config/openconext/parameters.yaml -# Add the config files for Apache2 -RUN rm -rf /etc/apache2/sites-enabled/* +RUN cp config/openconext/parameters.yaml.dist config/openconext/parameters.yaml && \ + rm -rf /etc/apache2/sites-enabled/* COPY ./docker/conf/webauthn-apache2.conf /etc/apache2/sites-enabled/webauthn.conf RUN rm -rf /var/www/html/var/cache/prod && \ mkdir -p /var/www/html/var/ && \