Mirrors/librenms-docker
1
0
Fork 0
mirror of https://github.com/librenms/docker.git synced 2026-01-23 02:14:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #479 from crazy-max/alpine-3.21

Browse source 
Alpine Linux 3.21
This commit is contained in:
CrazyMax 2025-01-04 16:20:43 +01:00 • committed by GitHub
commit 74d179c244
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -2,8 +2,8 @@
ARG LIBRENMS_VERSION="24.12.0"
ARG WEATHERMAP_PLUGIN_COMMIT="0b2ff643b65ee4948e4f74bb5cad5babdaddef27"
ARG ALPINE_VERSION="3.19"
ARG SYSLOGNG_VERSION="4.5.0-r0"
ARG ALPINE_VERSION="3.21"
ARG SYSLOGNG_VERSION="4.8.1-r1"
FROM crazymax/yasu:latest AS yasu
FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3
@ -73,7 +73,6 @@ RUN apk --update --no-cache add \
tzdata \
util-linux \
whois \
&& ln -s /usr/bin/php83 /usr/bin/php \
&& apk --update --no-cache add -t build-dependencies \
build-base \
make \

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

@ -55,7 +55,7 @@ if [ -z "$DB_PASSWORD" ]; then
exit 1
fi
dbcmd="mysql -h ${DB_HOST} -P ${DB_PORT} -u "${DB_USER}" "-p${DB_PASSWORD}""
dbcmd="mariadb -h ${DB_HOST} -P ${DB_PORT} -u "${DB_USER}" "-p${DB_PASSWORD}""
unset DB_PASSWORD
echo "Waiting ${DB_TIMEOUT}s for database to be ready..."

2
rootfs/etc/cont-init.d/05-svc-dispatcher.sh
View file

@ -56,7 +56,7 @@ if [ -z "$DB_PASSWORD" ]; then
exit 1
fi
dbcmd="mysql -h ${DB_HOST} -P ${DB_PORT} -u "${DB_USER}" "-p${DB_PASSWORD}""
dbcmd="mariadb -h ${DB_HOST} -P ${DB_PORT} -u "${DB_USER}" "-p${DB_PASSWORD}""
unset DB_PASSWORD
echo "Waiting ${DB_TIMEOUT}s for database to be ready..."

2
rootfs/etc/my.cnf.d/skip-ssl.cnf Normal file
View file

@ -0,0 +1,2 @@
[client]
skip-ssl = true

2
rootfs/etc/syslog-ng/syslog-ng.conf
View file

@ -1,4 +1,4 @@
@version:4.5
@version:4.8
options {
chain_hostnames(off);