Skip to content

Commit 823d742

Browse files
committed
PHP 8.4
1 parent a29ac35 commit 823d742

6 files changed

Lines changed: 37 additions & 37 deletions

File tree

Dockerfile

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,36 @@ RUN apk --update --no-cache add \
3636
openssl \
3737
openssh-client \
3838
perl \
39-
php83 \
40-
php83-cli \
41-
php83-ctype \
42-
php83-curl \
43-
php83-dom \
44-
php83-fileinfo \
45-
php83-fpm \
46-
php83-gd \
47-
php83-gmp \
48-
php83-iconv \
49-
php83-json \
50-
php83-ldap \
51-
php83-mbstring \
52-
php83-mysqlnd \
53-
php83-opcache \
54-
php83-openssl \
55-
php83-pdo \
56-
php83-pdo_mysql \
57-
php83-pecl-memcached \
58-
php83-pear \
59-
php83-phar \
60-
php83-posix \
61-
php83-session \
62-
php83-simplexml \
63-
php83-snmp \
64-
php83-sockets \
65-
php83-tokenizer \
66-
php83-xml \
67-
php83-xmlwriter \
68-
php83-zip \
39+
php84 \
40+
php84-cli \
41+
php84-ctype \
42+
php84-curl \
43+
php84-dom \
44+
php84-fileinfo \
45+
php84-fpm \
46+
php84-gd \
47+
php84-gmp \
48+
php84-iconv \
49+
php84-json \
50+
php84-ldap \
51+
php84-mbstring \
52+
php84-mysqlnd \
53+
php84-opcache \
54+
php84-openssl \
55+
php84-pdo \
56+
php84-pdo_mysql \
57+
php84-pecl-memcached \
58+
php84-pear \
59+
php84-phar \
60+
php84-posix \
61+
php84-session \
62+
php84-simplexml \
63+
php84-snmp \
64+
php84-sockets \
65+
php84-tokenizer \
66+
php84-xml \
67+
php84-xmlwriter \
68+
php84-zip \
6969
python3 \
7070
py3-pip \
7171
rrdtool \

rootfs/etc/cont-init.d/02-fix-perms.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ chown -R librenms:librenms \
1717
/tpls \
1818
/var/lib/nginx \
1919
/var/log/nginx \
20-
/var/log/php83 \
20+
/var/log/php84 \
2121
/var/run/nginx \
2222
/var/run/php-fpm

rootfs/etc/cont-init.d/03-config.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \
6464
-e "s/@FPM_PM_START_SERVERS@/$FPM_PM_START_SERVERS/g" \
6565
-e "s/@FPM_PM_MIN_SPARE_SERVERS@/$FPM_PM_MIN_SPARE_SERVERS/g" \
6666
-e "s/@FPM_PM_MAX_SPARE_SERVERS@/$FPM_PM_MAX_SPARE_SERVERS/g" \
67-
/tpls/etc/php83/php-fpm.d/www.conf >/etc/php83/php-fpm.d/www.conf
67+
/tpls/etc/php84/php-fpm.d/www.conf >/etc/php84/php-fpm.d/www.conf
6868

6969
echo "Setting PHP INI configuration..."
70-
sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php83/php.ini
71-
sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php83/php.ini
72-
sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php83/php.ini
70+
sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php84/php.ini
71+
sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php84/php.ini
72+
sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php84/php.ini
7373

7474
# OpCache
7575
echo "Setting OpCache configuration..."
7676
sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
77-
/tpls/etc/php83/conf.d/opcache.ini >/etc/php83/conf.d/opcache.ini
77+
/tpls/etc/php84/conf.d/opcache.ini >/etc/php84/conf.d/opcache.ini
7878

7979
# Nginx
8080
echo "Setting Nginx configuration..."

rootfs/etc/cont-init.d/04-svc-main.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ cat >/etc/services.d/php-fpm/run <<EOL
9999
#!/usr/bin/execlineb -P
100100
with-contenv
101101
s6-setuidgid ${PUID}:${PGID}
102-
php-fpm83 -F
102+
php-fpm84 -F
103103
EOL
104104
chmod +x /etc/services.d/php-fpm/run
105105

0 commit comments

Comments
 (0)