From 143993fe8383732a01e99ddab92be9eb22bdd2c2 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 14 Jul 2023 14:15:26 +0900 Subject: [PATCH] Fixed MySQL socket usage in web-interface image --- Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh | 6 +++++- Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh | 6 +++++- 9 files changed, 45 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index b882666fc..baba67347 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh index fc0011add..83e8bcb8c 100755 --- a/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/centos/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh index fc0011add..83e8bcb8c 100755 --- a/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ol/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index f65473991..7643c27ec 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index 44a920314..67df2cb59 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh index 5664473e7..f71ce3895 100755 --- a/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/centos/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh index 5664473e7..f71ce3895 100755 --- a/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ol/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh index b00c05bdc..7463182cb 100755 --- a/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/rhel/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 08b65d2f0..443c1bf26 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -57,7 +57,11 @@ file_env() { # Check prerequisites for MySQL database check_variables() { - : ${DB_SERVER_HOST:="mysql-server"} + if [ ! -n "${DB_SERVER_SOCKET}" ]; then + : ${DB_SERVER_HOST:="mysql-server"} + else + DB_SERVER_HOST="localhost" + fi : ${DB_SERVER_PORT:="3306"} file_env MYSQL_USER