From b823f6bc47ef7eb0e03305e94783a622043b9906 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 1 Mar 2024 10:39:15 +0100 Subject: [PATCH 1/3] Alpine Linux 3.19 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4024b8ce..d2d4ffac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG LIBRENMS_VERSION="24.2.0" ARG WEATHERMAP_PLUGIN_COMMIT="0b2ff643b65ee4948e4f74bb5cad5babdaddef27" -ARG ALPINE_VERSION="3.17" +ARG ALPINE_VERSION="3.19" FROM crazymax/yasu:latest AS yasu FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 @@ -79,8 +79,8 @@ RUN apk --update --no-cache add \ mariadb-dev \ musl-dev \ python3-dev \ - && pip3 install --upgrade pip \ - && pip3 install python-memcached mysqlclient --upgrade \ + && pip3 install --upgrade --break-system-packages pip \ + && pip3 install python-memcached mysqlclient --upgrade --break-system-packages \ && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \ && apk del build-dependencies \ && rm -rf /var/www/* /tmp/* \ @@ -118,7 +118,7 @@ RUN apk --update --no-cache add -t build-dependencies \ python3-dev \ && echo "Installing LibreNMS https://github.com/librenms/librenms.git#${LIBRENMS_VERSION}..." \ && git clone --depth=1 --branch ${LIBRENMS_VERSION} https://github.com/librenms/librenms.git . \ - && pip3 install --ignore-installed -r requirements.txt --upgrade \ + && pip3 install --ignore-installed -r requirements.txt --upgrade --break-system-packages \ && COMPOSER_CACHE_DIR="/tmp" composer install --no-dev --no-interaction --no-ansi \ && mkdir config.d \ && cp config.php.default config.php \ From 8b789d36f4968da1f272909220af8af85182ffed Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 16 Jul 2023 23:21:55 +0200 Subject: [PATCH 2/3] Update syslogng to 4.5.0-r0 --- Dockerfile | 5 ++++- rootfs/etc/syslog-ng/syslog-ng.conf | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2d4ffac..d4279d6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ ARG LIBRENMS_VERSION="24.2.0" ARG WEATHERMAP_PLUGIN_COMMIT="0b2ff643b65ee4948e4f74bb5cad5babdaddef27" ARG ALPINE_VERSION="3.19" +ARG SYSLOGNG_VERSION="4.5.0-r0" FROM crazymax/yasu:latest AS yasu FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3 @@ -68,7 +69,6 @@ RUN apk --update --no-cache add \ runit \ sed \ shadow \ - syslog-ng=3.38.1-r0 \ ttf-dejavu \ tzdata \ util-linux \ @@ -96,6 +96,9 @@ RUN apk --update --no-cache add \ && setcap cap_net_raw+ep /usr/lib/monitoring-plugins/check_icmp \ && setcap cap_net_raw+ep /usr/lib/monitoring-plugins/check_ping +ARG SYSLOGNG_VERSION +RUN apk --update --no-cache add syslog-ng=${SYSLOGNG_VERSION} + ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \ LIBRENMS_PATH="/opt/librenms" \ LIBRENMS_DOCKER="1" \ diff --git a/rootfs/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf index e7009ec9..840c5355 100644 --- a/rootfs/etc/syslog-ng/syslog-ng.conf +++ b/rootfs/etc/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version:3.38 +@version:4.5 options { chain_hostnames(off); From fe485f877a01ea6057f0d3e60208786f5793cd07 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 1 Mar 2024 10:49:13 +0100 Subject: [PATCH 3/3] PHP 8.2 --- Dockerfile | 56 +++++++++---------- 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/{php81 => php82}/conf.d/opcache.ini | 0 .../etc/{php81 => php82}/php-fpm.d/www.conf | 0 6 files changed, 35 insertions(+), 35 deletions(-) rename rootfs/tpls/etc/{php81 => php82}/conf.d/opcache.ini (100%) rename rootfs/tpls/etc/{php81 => php82}/php-fpm.d/www.conf (100%) diff --git a/Dockerfile b/Dockerfile index d4279d6e..c0d3784f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,34 +35,34 @@ RUN apk --update --no-cache add \ openssl \ openssh-client \ perl \ - php81 \ - php81-cli \ - php81-ctype \ - php81-curl \ - php81-dom \ - php81-fileinfo \ - php81-fpm \ - php81-gd \ - php81-gmp \ - php81-json \ - php81-ldap \ - php81-mbstring \ - php81-mysqlnd \ - php81-opcache \ - php81-openssl \ - php81-pdo \ - php81-pdo_mysql \ - php81-pecl-memcached \ - php81-pear \ - php81-phar \ - php81-posix \ - php81-session \ - php81-simplexml \ - php81-snmp \ - php81-sockets \ - php81-tokenizer \ - php81-xml \ - php81-zip \ + php82 \ + php82-cli \ + php82-ctype \ + php82-curl \ + php82-dom \ + php82-fileinfo \ + php82-fpm \ + php82-gd \ + php82-gmp \ + php82-json \ + php82-ldap \ + php82-mbstring \ + php82-mysqlnd \ + php82-opcache \ + php82-openssl \ + php82-pdo \ + php82-pdo_mysql \ + php82-pecl-memcached \ + php82-pear \ + php82-phar \ + php82-posix \ + php82-session \ + php82-simplexml \ + php82-snmp \ + php82-sockets \ + php82-tokenizer \ + php82-xml \ + php82-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 3b54519f..4f43ab61 100644 --- a/rootfs/etc/cont-init.d/02-fix-perms.sh +++ b/rootfs/etc/cont-init.d/02-fix-perms.sh @@ -16,6 +16,6 @@ chown -R librenms:librenms \ /tpls \ /var/lib/nginx \ /var/log/nginx \ - /var/log/php81 \ + /var/log/php82 \ /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 18402aa5..d9b4534f 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/php81/php-fpm.d/www.conf >/etc/php81/php-fpm.d/www.conf + /tpls/etc/php82/php-fpm.d/www.conf >/etc/php82/php-fpm.d/www.conf echo "Setting PHP INI configuration..." -sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php81/php.ini -sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php81/php.ini -sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php81/php.ini +sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php82/php.ini +sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php82/php.ini +sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php82/php.ini # OpCache echo "Setting OpCache configuration..." sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \ - /tpls/etc/php81/conf.d/opcache.ini >/etc/php81/conf.d/opcache.ini + /tpls/etc/php82/conf.d/opcache.ini >/etc/php82/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 b4ff0f1d..f81d8241 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 <