Skip to content

Feature/build php82 #93

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.

Sign up for GitHub

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

Merged
MKodde merged 2 commits into from
Dec 20, 2023
Merged

Feature/build php82 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8231f
Make the build php82 ready
quartje Dec 18, 2023
180337d
Docker: We do not use the dev image anymore
quartje Dec 18, 2023
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
10 changes: 0 additions & 10 deletions .github/workflows/build-push-docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,3 @@ jobs:
ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:prod
ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:${{ github.sha }}
ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:${{ steps.release.outputs.tag_name }}

- name: Build and push the Development image
uses: docker/build-push-action@v4
with:
context: .
file: docker/Dockerfile.dev
platforms: linux/amd64,linux/arm64
push: true
tags: |
ghcr.io/openconext/stepup-gssp-example/stepup-gssp-example:dev
2 changes: 1 addition & 1 deletion .github/workflows/tag-release.yml
View file
Open in desktop
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
View file
Open in desktop
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
10 changes: 0 additions & 10 deletions docker/Dockerfile.dev
View file
Open in desktop

This file was deleted.

13 changes: 5 additions & 8 deletions docker/Dockerfile.prod
View file
Open in desktop
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"]