From 53c6ea08c3e9809e38c2c4b58a3074b7b0f76bda Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 5 Feb 2025 14:06:17 +1100 Subject: [PATCH] healthcheck config on socket/port - omit The socket/port that where used in the initialization of the datadir in the /var/lib/mysql may not be the same used at runtime. This was highlighted in #630 where the ubi container puts a socket in a different location from the non-ubi container. On the assumption that any change of default port/socket is going to be in a server configuration file, preferably with a [client-server] section, lets omit copying this unnecessary. This does however mean that command line specified changes to socket (and port less so) will not be persistent. This means that podman run mariadb:lts --socket=/tmp/s.sock will not be discoverable for the healtcheck.sh script. Closes: #630 --- 10.11-ubi/docker-entrypoint.sh | 2 +- 10.11/docker-entrypoint.sh | 2 +- 10.5/docker-entrypoint.sh | 2 +- 10.6-ubi/docker-entrypoint.sh | 2 +- 10.6/docker-entrypoint.sh | 2 +- 11.2/docker-entrypoint.sh | 2 +- 11.4-ubi/docker-entrypoint.sh | 2 +- 11.4/docker-entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- main-ubi/docker-entrypoint.sh | 2 +- main/docker-entrypoint.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/10.11-ubi/docker-entrypoint.sh b/10.11-ubi/docker-entrypoint.sh index 7f77ab49..45b1dd79 100755 --- a/10.11-ubi/docker-entrypoint.sh +++ b/10.11-ubi/docker-entrypoint.sh @@ -357,7 +357,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index 7f77ab49..45b1dd79 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -357,7 +357,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index ea266500..31be60b3 100755 --- a/10.5/docker-entrypoint.sh +++ b/10.5/docker-entrypoint.sh @@ -348,7 +348,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/10.6-ubi/docker-entrypoint.sh b/10.6-ubi/docker-entrypoint.sh index 4ff446eb..7637ac50 100755 --- a/10.6-ubi/docker-entrypoint.sh +++ b/10.6-ubi/docker-entrypoint.sh @@ -349,7 +349,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index 4ff446eb..7637ac50 100755 --- a/10.6/docker-entrypoint.sh +++ b/10.6/docker-entrypoint.sh @@ -349,7 +349,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh index ea7eb702..5a25e5ae 100755 --- a/11.2/docker-entrypoint.sh +++ b/11.2/docker-entrypoint.sh @@ -357,7 +357,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/11.4-ubi/docker-entrypoint.sh b/11.4-ubi/docker-entrypoint.sh index 1192a4a1..2e98cddc 100755 --- a/11.4-ubi/docker-entrypoint.sh +++ b/11.4-ubi/docker-entrypoint.sh @@ -359,7 +359,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh index 1192a4a1..2e98cddc 100755 --- a/11.4/docker-entrypoint.sh +++ b/11.4/docker-entrypoint.sh @@ -359,7 +359,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 1cab70d2..5e13bc56 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -359,7 +359,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/main-ubi/docker-entrypoint.sh b/main-ubi/docker-entrypoint.sh index d3bf557f..ed46e4d5 100755 --- a/main-ubi/docker-entrypoint.sh +++ b/main-ubi/docker-entrypoint.sh @@ -359,7 +359,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve } diff --git a/main/docker-entrypoint.sh b/main/docker-entrypoint.sh index d3bf557f..ed46e4d5 100755 --- a/main/docker-entrypoint.sh +++ b/main/docker-entrypoint.sh @@ -359,7 +359,7 @@ create_healthcheck_users() { local maskPreserve maskPreserve=$(umask -p) umask 0077 - echo -e "[mariadb-client]\\nport=$PORT\\nsocket=$SOCKET\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf + echo -e "[mariadb-client]\\nuser=healthcheck\\npassword=$healthCheckConnectPass\\n" > "$DATADIR"/.my-healthcheck.cnf $maskPreserve }