holm/Part-DB-server
1
0
Fork 0
forked from mirror/Part-DB.Part-DB-server
Code Pull requests Activity

Apply the PHP_VERSION arg also to the partdb-entrypoint during build, to make it really version independent

Browse source
This commit is contained in:
Jan Böhmer 2024-09-08 19:40:19 +02:00
parent ad02d7e525
commit 7366a33fe5
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.docker/partdb-entrypoint.sh
View file

@ -39,8 +39,8 @@ if [ -d /var/www/html/var/db ]; then
fi
fi
# Start PHP-FPM
service php8.1-fpm start
# Start PHP-FPM (the PHP_VERSION is replaced by the configured version in the Dockerfile)
service phpPHP_VERSION-fpm start
# first arg is `-f` or `--some-option` (taken from https://github.com/docker-library/php/blob/master/8.2/bullseye/apache/docker-php-entrypoint)
if [ "${1#-}" != "$1" ]; then

3
Dockerfile
View file

@ -163,6 +163,9 @@ ENV DATABASE_URL="sqlite:///%kernel.project_dir%/uploads/app.db"
USER root
# Replace the php version placeholder in the entry point, with our php version
RUN sed -i "s/PHP_VERSION/${PHP_VERSION}/g" ./.docker/partdb-entrypoint.sh
# Copy entrypoint and apache2-foreground to /usr/local/bin and make it executable
RUN install ./.docker/partdb-entrypoint.sh /usr/local/bin && \
install ./.docker/apache2-foreground /usr/local/bin