Skip to content

Commit 6620673

Browse files
committed
Use PHP 8.2
1 parent 202dc35 commit 6620673

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

docker/Dockerfile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ ARG DIST_URL="https://github.com/leenooks/phpLDAPadmin/archive/refs/tags/${VERSI
66
ARG BUILD_DATE
77
ARG VCS_REF
88

9+
ARG PHP_VERSION_MAJOR="8"
10+
ARG PHP_VERSION_MINOR="2"
11+
912
# Set user and group
1013
ARG user=deploy
1114
ARG group=deploy
@@ -18,22 +21,22 @@ COPY --from=botsudo/docker-rustpython:latest /usr/local/share/sbom/rustpython.sp
1821

1922
RUN apk add --no-cache --update nginx curl bash musl \
2023
openssl libgcc \
21-
php81-fpm php81 php81-session \
22-
php81-json php81-curl php81-xml php81-gettext php81-mbstring php81-ldap php81-ctype && \
24+
php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-fpm php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR} php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-session \
25+
php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-json php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-curl php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-xml php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-gettext php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-mbstring php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-ldap php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}-ctype && \
2326
apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing horust && \
24-
horust --help && nginx -v && php-fpm81 -v && php -v && \
25-
mkdir -p /var/log/php81 && \
27+
horust --help && nginx -v && php-fpm${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR} -v && php -v && \
28+
mkdir -p /var/log/php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR} && \
2629
mkdir /run/phpfpm && \
2730
ln -sf /dev/stdout /var/log/nginx/access.log && \
2831
ln -sf /dev/stderr /var/log/nginx/error.log && \
29-
ln -sf /dev/stderr /var/log/php81/error.log && \
32+
ln -sf /dev/stderr /var/log/php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}/error.log && \
3033
date -R > /build_date && \
3134
printf '{"build_date": "%s", "timestamp": %i}' "$(date -R)" "$(date +%s)" > /build_date.json && \
3235
addgroup -S ${group} && \
3336
adduser -G ${group} -G nginx -s /bin/sh -h /var/www/phpldapadmin -S ${user} && \
3437
id deploy && \
35-
chown -R deploy:deploy /var/log/php81 /var/lib/nginx /run/nginx /run/phpfpm && \
36-
chmod -R 770 /var/log/php81 /var/lib/nginx /run/nginx /run/phpfpm && \
38+
chown -R deploy:deploy /var/log/php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR} /var/lib/nginx /run/nginx /run/phpfpm && \
39+
chmod -R 770 /var/log/php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR} /var/lib/nginx /run/nginx /run/phpfpm && \
3740
mkdir /container && \
3841
chown deploy:deploy /container && \
3942
rustpython --help
@@ -46,7 +49,7 @@ COPY pythontojson.py /usr/local/sbin/
4649
COPY --chown=deploy:deploy horust/ /etc/horust/
4750
COPY nginx-default.conf /etc/nginx/http.d/default.conf
4851
COPY nginx.conf /etc/nginx/nginx.conf
49-
COPY php-fpm-www-pool.conf /etc/php81/php-fpm.d/www.conf
52+
COPY php-fpm-www-pool.conf /etc/php${PHP_VERSION_MAJOR}${PHP_VERSION_MINOR}/php-fpm.d/www.conf
5053
COPY --chown=deploy:deploy config.php ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config/config.php
5154

5255

0 commit comments

Comments
 (0)