From a29ac35f5be8adc17a92469ebcda1c73ced47a79 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sun, 17 May 2026 19:33:27 +0200 Subject: [PATCH 1/3] Alpine Linux 3.23 --- Dockerfile | 4 ++-- rootfs/etc/syslog-ng/syslog-ng.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77e7a13f..fd0ec98a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ # renovate: datasource=github-releases packageName=librenms/librenms versioning=semver ARG LIBRENMS_VERSION="26.4.1" -ARG ALPINE_VERSION="3.22" -ARG SYSLOGNG_VERSION="4.8.3-r1" +ARG ALPINE_VERSION="3.23" +ARG SYSLOGNG_VERSION="4.10.2-r1" FROM tianon/gosu:latest AS gosu diff --git a/rootfs/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf index 0ee0f051..8fbb6177 100644 --- a/rootfs/etc/syslog-ng/syslog-ng.conf +++ b/rootfs/etc/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version:4.8 +@version:4.10 options { chain_hostnames(off); @@ -8,7 +8,7 @@ options { owner("root"); group("adm"); perm(0640); - stats_freq(0); + stats(freq(0)); bad_hostname("^gconfd$"); }; From 823d742f27fd56ff9d9d7780aa298d8c5bc120d3 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sun, 17 May 2026 19:35:09 +0200 Subject: [PATCH 2/3] PHP 8.4 --- Dockerfile | 60 +++++++++---------- rootfs/etc/cont-init.d/02-fix-perms.sh | 2 +- rootfs/etc/cont-init.d/03-config.sh | 10 ++-- rootfs/etc/cont-init.d/04-svc-main.sh | 2 +- .../etc/{php83 => php84}/conf.d/opcache.ini | 0 .../etc/{php83 => php84}/php-fpm.d/www.conf | 0 6 files changed, 37 insertions(+), 37 deletions(-) rename rootfs/tpls/etc/{php83 => php84}/conf.d/opcache.ini (100%) rename rootfs/tpls/etc/{php83 => php84}/php-fpm.d/www.conf (100%) diff --git a/Dockerfile b/Dockerfile index fd0ec98a..9e579384 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,36 +36,36 @@ RUN apk --update --no-cache add \ openssl \ openssh-client \ perl \ - php83 \ - php83-cli \ - php83-ctype \ - php83-curl \ - php83-dom \ - php83-fileinfo \ - php83-fpm \ - php83-gd \ - php83-gmp \ - php83-iconv \ - php83-json \ - php83-ldap \ - php83-mbstring \ - php83-mysqlnd \ - php83-opcache \ - php83-openssl \ - php83-pdo \ - php83-pdo_mysql \ - php83-pecl-memcached \ - php83-pear \ - php83-phar \ - php83-posix \ - php83-session \ - php83-simplexml \ - php83-snmp \ - php83-sockets \ - php83-tokenizer \ - php83-xml \ - php83-xmlwriter \ - php83-zip \ + php84 \ + php84-cli \ + php84-ctype \ + php84-curl \ + php84-dom \ + php84-fileinfo \ + php84-fpm \ + php84-gd \ + php84-gmp \ + php84-iconv \ + php84-json \ + php84-ldap \ + php84-mbstring \ + php84-mysqlnd \ + php84-opcache \ + php84-openssl \ + php84-pdo \ + php84-pdo_mysql \ + php84-pecl-memcached \ + php84-pear \ + php84-phar \ + php84-posix \ + php84-session \ + php84-simplexml \ + php84-snmp \ + php84-sockets \ + php84-tokenizer \ + php84-xml \ + php84-xmlwriter \ + php84-zip \ python3 \ py3-pip \ rrdtool \ diff --git a/rootfs/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh index 93203df1..f968e426 100644 --- a/rootfs/etc/cont-init.d/02-fix-perms.sh +++ b/rootfs/etc/cont-init.d/02-fix-perms.sh @@ -17,6 +17,6 @@ chown -R librenms:librenms \ /tpls \ /var/lib/nginx \ /var/log/nginx \ - /var/log/php83 \ + /var/log/php84 \ /var/run/nginx \ /var/run/php-fpm diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh index 013c15cb..5b02a259 100644 --- a/rootfs/etc/cont-init.d/03-config.sh +++ b/rootfs/etc/cont-init.d/03-config.sh @@ -64,17 +64,17 @@ sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \ -e "s/@FPM_PM_START_SERVERS@/$FPM_PM_START_SERVERS/g" \ -e "s/@FPM_PM_MIN_SPARE_SERVERS@/$FPM_PM_MIN_SPARE_SERVERS/g" \ -e "s/@FPM_PM_MAX_SPARE_SERVERS@/$FPM_PM_MAX_SPARE_SERVERS/g" \ - /tpls/etc/php83/php-fpm.d/www.conf >/etc/php83/php-fpm.d/www.conf + /tpls/etc/php84/php-fpm.d/www.conf >/etc/php84/php-fpm.d/www.conf echo "Setting PHP INI configuration..." -sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php83/php.ini -sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php83/php.ini -sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php83/php.ini +sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php84/php.ini +sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php84/php.ini +sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php84/php.ini # OpCache echo "Setting OpCache configuration..." sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \ - /tpls/etc/php83/conf.d/opcache.ini >/etc/php83/conf.d/opcache.ini + /tpls/etc/php84/conf.d/opcache.ini >/etc/php84/conf.d/opcache.ini # Nginx echo "Setting Nginx configuration..." diff --git a/rootfs/etc/cont-init.d/04-svc-main.sh b/rootfs/etc/cont-init.d/04-svc-main.sh index 5ac92f93..d26b52f5 100644 --- a/rootfs/etc/cont-init.d/04-svc-main.sh +++ b/rootfs/etc/cont-init.d/04-svc-main.sh @@ -99,7 +99,7 @@ cat >/etc/services.d/php-fpm/run < Date: Sun, 17 May 2026 19:42:09 +0200 Subject: [PATCH 3/3] ci: fix deprecated input for container-logs-check --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 96d0ee62..a9c451fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,9 +65,9 @@ jobs: LIBRENMS_CONTAINER: ${{ env.CONTAINER_NAME }} - name: Check container logs - uses: crazy-max/.github/.github/actions/container-logs-check@main + uses: crazy-max/.github/.github/actions/container-logs-check@v1 with: - container_name: ${{ env.CONTAINER_NAME }} + name: ${{ env.CONTAINER_NAME }} log_check: "ready to handle connections" timeout: 120 -