Skip to content

Commit

Permalink
Alpine Linux 3.21
Browse files Browse the repository at this point in the history
  • Loading branch information
crazy-max committed Jan 4, 2025
1 parent fdfd4c3 commit d7b059d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
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 @@ -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..."
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/05-svc-dispatcher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
2 changes: 2 additions & 0 deletions rootfs/etc/my.cnf.d/skip-ssl.cnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[client]
skip-ssl = true
2 changes: 1 addition & 1 deletion rootfs/etc/syslog-ng/syslog-ng.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@version:4.5
@version:4.8

options {
chain_hostnames(off);
Expand Down

0 comments on commit d7b059d

Please sign in to comment.