diff --git a/Dockerfile b/Dockerfile index fcba7abf..d02b31a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/rootfs/etc/cont-init.d/04-svc-main.sh b/rootfs/etc/cont-init.d/04-svc-main.sh index f03ca695..5ac92f93 100644 --- a/rootfs/etc/cont-init.d/04-svc-main.sh +++ b/rootfs/etc/cont-init.d/04-svc-main.sh @@ -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..." diff --git a/rootfs/etc/cont-init.d/05-svc-dispatcher.sh b/rootfs/etc/cont-init.d/05-svc-dispatcher.sh index a0439995..ba9754f0 100644 --- a/rootfs/etc/cont-init.d/05-svc-dispatcher.sh +++ b/rootfs/etc/cont-init.d/05-svc-dispatcher.sh @@ -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..." diff --git a/rootfs/etc/my.cnf.d/skip-ssl.cnf b/rootfs/etc/my.cnf.d/skip-ssl.cnf new file mode 100644 index 00000000..bcb42709 --- /dev/null +++ b/rootfs/etc/my.cnf.d/skip-ssl.cnf @@ -0,0 +1,2 @@ +[client] +skip-ssl = true diff --git a/rootfs/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf index 840c5355..0ee0f051 100644 --- a/rootfs/etc/syslog-ng/syslog-ng.conf +++ b/rootfs/etc/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version:4.5 +@version:4.8 options { chain_hostnames(off);