Skip to content

maint: additional cleanup after PHP 8.4 #213

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
mcdurdin merged 1 commit into from
Sep 15, 2026
Merged

maint: additional cleanup after PHP 8.4 #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# syntax=docker/dockerfile:1
FROM php:8.4-apache@sha256:51da594c844a97f31b1cd6b1ac6660982f40788f4fe13e75f7fd39e2f9b58651 AS composer-builder
ENV BUILDER_PLATFORM=docker-composer

# Install Zip to use composer
RUN apt-get update && apt-get install -y \
Expand All @@ -19,8 +20,17 @@ RUN composer install

# Site
FROM php:8.4-apache@sha256:51da594c844a97f31b1cd6b1ac6660982f40788f4fe13e75f7fd39e2f9b58651
ENV BUILDER_PLATFORM=docker

COPY resources/keyman-site.conf /etc/apache2/conf-available/
RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini

ARG BUILDER_CONFIGURATION
RUN if [ "$BUILDER_CONFIGURATION" = "debug" ]; then \
cp /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini ; \
else \
cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini ; \
fi

RUN chown -R www-data:www-data /var/www/html/
COPY resources/run.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/run.sh
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "keyman/keymanweb.com",
"require": {
"sentry/sdk": "^3.1"
},
"config": {
"allow-plugins": false
},
"require-dev": {
"phpunit/phpunit": "^9.6"
},
"require": {
"sentry/sentry": "^4.31"
}
}
Loading