Skip to content

Commit

Permalink
Bump PHP version of test container
Browse files Browse the repository at this point in the history
  • Loading branch information
pablothedude committed Dec 18, 2024
1 parent 656d82f commit 55e2bf0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-push-test-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
18 changes: 12 additions & 6 deletions docker/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
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

# 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"]

0 comments on commit 55e2bf0

Please sign in to comment.