Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump PHP version of test container #415

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pr title says: php version bump.

Why is port 80 exposed?
Why change cache:clear into rm cache/prod?
What's the busybox part?

Maybe discuss? Or is this copy/pasted from another project?

Loading