Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
-
Expand Down
64 changes: 32 additions & 32 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/02-fix-perms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions rootfs/etc/cont-init.d/03-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/04-svc-main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ cat >/etc/services.d/php-fpm/run <<EOL
#!/usr/bin/execlineb -P
with-contenv
s6-setuidgid ${PUID}:${PGID}
php-fpm83 -F
php-fpm84 -F
EOL
chmod +x /etc/services.d/php-fpm/run

Expand Down
4 changes: 2 additions & 2 deletions rootfs/etc/syslog-ng/syslog-ng.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@version:4.8
@version:4.10

options {
chain_hostnames(off);
Expand All @@ -8,7 +8,7 @@ options {
owner("root");
group("adm");
perm(0640);
stats_freq(0);
stats(freq(0));
bad_hostname("^gconfd$");
};

Expand Down