Skip to content

Commit

Permalink
Make the build php82 ready
Browse files Browse the repository at this point in the history
The docker image needs a php82 container as base. The tag-release Github
action is set to use the Stepup-Deploy branch with php82 support
  • Loading branch information
quartje committed Dec 18, 2023
1 parent a7effe8 commit be8231f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: OpenConext/Stepup-Build
ref: master
ref: feature/php82_build
- name: Output the semver tag to the tag variable
id: vars
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
Expand Down
2 changes: 1 addition & 1 deletion component_info
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PHP_VERSION=72
PHP_VERSION=82
SYMFONY_VERSION=4
ENCORE=yes
ASSETIC=no
Expand Down
13 changes: 5 additions & 8 deletions docker/Dockerfile.prod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
FROM ghcr.io/openconext/openconext-basecontainers/php82-apache2:latest AS php-build
# Set the default workdir
WORKDIR /var/www/html

COPY *.tar.bz2 /tmp/
RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
rm -rf /tmp/*.tar.bz2

# Add the application configuration files
COPY config/packages/parameters.yaml.dist config/packages/parameters.yaml
COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml
COPY .env.docker .env
COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml

# Add the config files for Apache2
RUN rm -rf /etc/apache2/sites-enabled/*
Expand All @@ -15,7 +15,4 @@ 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

CMD ["apache2-foreground"]

0 comments on commit be8231f

Please sign in to comment.