Skip to content

Commit

Permalink
containers: use mariadb-admin instead of deprecated mysqladmin (#6026)
Browse files Browse the repository at this point in the history
* dockerfiles: use mariadb-admin instead of deprecated mysqladmin command

* compose: bump compose tags
  • Loading branch information
DerLinkman committed Aug 19, 2024
1 parent cb50d08 commit b70bcd3
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion data/Dockerfiles/acme/acme.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ fi
chmod 600 ${ACME_BASE}/key.pem

log_f "Waiting for database..."
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent > /dev/null; do
while ! /usr/bin/mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent > /dev/null; do
sleep 2
done
log_f "Database OK"
Expand Down
2 changes: 1 addition & 1 deletion data/Dockerfiles/dovecot/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e

# Wait for MySQL to warm-up
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
while ! mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for database to come up..."
sleep 2
done
Expand Down
4 changes: 2 additions & 2 deletions data/Dockerfiles/phpfpm/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
function array_by_comma { local IFS=","; echo "$*"; }

# Wait for containers
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
while ! mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for SQL..."
sleep 2
done
Expand Down Expand Up @@ -44,7 +44,7 @@ until [[ ${SQL_UPGRADE_STATUS} == 'success' ]]; do
echo "MySQL applied an upgrade, debug output:"
echo ${SQL_FULL_UPGRADE_RETURN}
sleep 3
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
while ! mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for SQL to return, please wait"
sleep 2
done
Expand Down
2 changes: 1 addition & 1 deletion data/Dockerfiles/postfix/postfix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ trap "postfix stop" EXIT
[[ ! -d /opt/postfix/conf/sql/ ]] && mkdir -p /opt/postfix/conf/sql/

# Wait for MySQL to warm-up
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
while ! mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for database to come up..."
sleep 2
done
Expand Down
2 changes: 1 addition & 1 deletion data/Dockerfiles/sogo/bootstrap-sogo.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Wait for MySQL to warm-up
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
while ! mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for database to come up..."
sleep 2
done
Expand Down
2 changes: 1 addition & 1 deletion data/Dockerfiles/watchdog/watchdog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if [[ ! -p /tmp/com_pipe ]]; then
fi

# Wait for containers
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
while ! mariadb-admin status --ssl=false --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for SQL..."
sleep 2
done
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ services:
- rspamd

php-fpm-mailcow:
image: mailcow/phpfpm:1.88
image: mailcow/phpfpm:1.89
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on:
- redis-mailcow
Expand Down Expand Up @@ -176,7 +176,7 @@ services:
- phpfpm

sogo-mailcow:
image: mailcow/sogo:1.124
image: mailcow/sogo:1.125
environment:
- DBNAME=${DBNAME}
- DBUSER=${DBUSER}
Expand Down Expand Up @@ -223,7 +223,7 @@ services:
- sogo

dovecot-mailcow:
image: mailcow/dovecot:2.0
image: mailcow/dovecot:2.1
depends_on:
- mysql-mailcow
- netfilter-mailcow
Expand Down Expand Up @@ -307,7 +307,7 @@ services:
- dovecot

postfix-mailcow:
image: mailcow/postfix:1.75
image: mailcow/postfix:1.76
depends_on:
mysql-mailcow:
condition: service_started
Expand Down Expand Up @@ -407,7 +407,7 @@ services:
condition: service_started
unbound-mailcow:
condition: service_healthy
image: mailcow/acme:1.89
image: mailcow/acme:1.90
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment:
Expand Down Expand Up @@ -463,7 +463,7 @@ services:
- /lib/modules:/lib/modules:ro

watchdog-mailcow:
image: mailcow/watchdog:2.04
image: mailcow/watchdog:2.05
dns:
- ${IPV4_NETWORK:-172.22.1}.254
tmpfs:
Expand Down

0 comments on commit b70bcd3

Please sign in to comment.