@@ -6,6 +6,9 @@ ARG DIST_URL="https://github.com/leenooks/phpLDAPadmin/archive/refs/tags/${VERSI
6
6
ARG BUILD_DATE
7
7
ARG VCS_REF
8
8
9
+ ARG PHP_VERSION_MAJOR="8"
10
+ ARG PHP_VERSION_MINOR="2"
11
+
9
12
# Set user and group
10
13
ARG user=deploy
11
14
ARG group=deploy
@@ -18,22 +21,22 @@ COPY --from=botsudo/docker-rustpython:latest /usr/local/share/sbom/rustpython.sp
18
21
19
22
RUN apk add --no-cache --update nginx curl bash musl \
20
23
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 && \
23
26
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} && \
26
29
mkdir /run/phpfpm && \
27
30
ln -sf /dev/stdout /var/log/nginx/access.log && \
28
31
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 && \
30
33
date -R > /build_date && \
31
34
printf '{"build_date": "%s", "timestamp": %i}' "$(date -R)" "$(date +%s)" > /build_date.json && \
32
35
addgroup -S ${group} && \
33
36
adduser -G ${group} -G nginx -s /bin/sh -h /var/www/phpldapadmin -S ${user} && \
34
37
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 && \
37
40
mkdir /container && \
38
41
chown deploy:deploy /container && \
39
42
rustpython --help
@@ -46,7 +49,7 @@ COPY pythontojson.py /usr/local/sbin/
46
49
COPY --chown=deploy:deploy horust/ /etc/horust/
47
50
COPY nginx-default.conf /etc/nginx/http.d/default.conf
48
51
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
50
53
COPY --chown=deploy:deploy config.php ${CONTAINER_SERVICE_DIR}/phpldapadmin/assets/config/config.php
51
54
52
55
0 commit comments