diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh index 6389072eb..18ba6e3a1 100755 --- a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh @@ -87,16 +87,20 @@ update_config_var() { echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..." fi - # Remove configuration parameter definition in case of unset parameter value + # Remove configuration parameter definition in case of unset or empty parameter value if [ -z "$var_value" ]; then sed -i -e "/^$var_name=/d" "$config_path" echo "removed" return fi - # Remove value from configuration parameter in case of double quoted parameter value - if [ "$var_value" == '""' ]; then - sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + # Remove value from configuration parameter in case of set to double quoted parameter value + if [[ "$var_value" == '""' ]]; then + if [ "$(grep -E "^$var_name=" $config_path)" ]; then + sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + else + sed -i -e "/^[#;] $var_name=/s/.*/&\n$var_name=/" "$config_path" + fi echo "undefined" return fi @@ -154,12 +158,12 @@ file_process_from_env() { # Check prerequisites for PostgreSQL database check_variables_postgresql() { + : ${DB_SERVER_HOST="postgres-server"} + : ${DB_SERVER_PORT:="5432"} + file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} - : ${DB_SERVER_PORT:="5432"} - DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"} DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""} @@ -171,12 +175,24 @@ check_variables_postgresql() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + DB_SERVER_HOST='""' + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect_postgresql() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" - echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + if [[ "$DB_SERVER_HOST" != '""' ]]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" if [ "${DEBUG_MODE,,}" == "true" ]; then @@ -206,8 +222,8 @@ check_db_connect_postgresql() { while true : do - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT @@ -244,7 +260,7 @@ psql_query() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - result=$(psql --no-align --quiet --tuples-only --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + result=$(psql --no-align --quiet --tuples-only $psql_connect_args \ --username "${DB_SERVER_ROOT_USER}" --command "$query" --dbname "$db" 2>/dev/null); unset PGPASSWORD @@ -284,7 +300,7 @@ exec_sql_file() { fi $command $sql_script | psql --quiet \ - --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + $psql_connect_args \ --username "${DB_SERVER_ZBX_USER}" --dbname "${DB_SERVER_DBNAME}" 1>/dev/null || exit 1 unset PGPASSWORD @@ -318,7 +334,7 @@ create_db_database_postgresql() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - createdb --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" --username "${DB_SERVER_ROOT_USER}" \ + createdb $psql_connect_args --username "${DB_SERVER_ROOT_USER}" \ --owner "${DB_SERVER_ZBX_USER}" --lc-ctype "en_US.utf8" --lc-collate "en_US.utf8" "${DB_SERVER_DBNAME}" unset PGPASSWORD diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh index 6389072eb..18ba6e3a1 100755 --- a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh @@ -87,16 +87,20 @@ update_config_var() { echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..." fi - # Remove configuration parameter definition in case of unset parameter value + # Remove configuration parameter definition in case of unset or empty parameter value if [ -z "$var_value" ]; then sed -i -e "/^$var_name=/d" "$config_path" echo "removed" return fi - # Remove value from configuration parameter in case of double quoted parameter value - if [ "$var_value" == '""' ]; then - sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + # Remove value from configuration parameter in case of set to double quoted parameter value + if [[ "$var_value" == '""' ]]; then + if [ "$(grep -E "^$var_name=" $config_path)" ]; then + sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + else + sed -i -e "/^[#;] $var_name=/s/.*/&\n$var_name=/" "$config_path" + fi echo "undefined" return fi @@ -154,12 +158,12 @@ file_process_from_env() { # Check prerequisites for PostgreSQL database check_variables_postgresql() { + : ${DB_SERVER_HOST="postgres-server"} + : ${DB_SERVER_PORT:="5432"} + file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} - : ${DB_SERVER_PORT:="5432"} - DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"} DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""} @@ -171,12 +175,24 @@ check_variables_postgresql() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + DB_SERVER_HOST='""' + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect_postgresql() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" - echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + if [[ "$DB_SERVER_HOST" != '""' ]]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" if [ "${DEBUG_MODE,,}" == "true" ]; then @@ -206,8 +222,8 @@ check_db_connect_postgresql() { while true : do - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT @@ -244,7 +260,7 @@ psql_query() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - result=$(psql --no-align --quiet --tuples-only --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + result=$(psql --no-align --quiet --tuples-only $psql_connect_args \ --username "${DB_SERVER_ROOT_USER}" --command "$query" --dbname "$db" 2>/dev/null); unset PGPASSWORD @@ -284,7 +300,7 @@ exec_sql_file() { fi $command $sql_script | psql --quiet \ - --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + $psql_connect_args \ --username "${DB_SERVER_ZBX_USER}" --dbname "${DB_SERVER_DBNAME}" 1>/dev/null || exit 1 unset PGPASSWORD @@ -318,7 +334,7 @@ create_db_database_postgresql() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - createdb --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" --username "${DB_SERVER_ROOT_USER}" \ + createdb $psql_connect_args --username "${DB_SERVER_ROOT_USER}" \ --owner "${DB_SERVER_ZBX_USER}" --lc-ctype "en_US.utf8" --lc-collate "en_US.utf8" "${DB_SERVER_DBNAME}" unset PGPASSWORD diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh index 6389072eb..18ba6e3a1 100755 --- a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh @@ -87,16 +87,20 @@ update_config_var() { echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..." fi - # Remove configuration parameter definition in case of unset parameter value + # Remove configuration parameter definition in case of unset or empty parameter value if [ -z "$var_value" ]; then sed -i -e "/^$var_name=/d" "$config_path" echo "removed" return fi - # Remove value from configuration parameter in case of double quoted parameter value - if [ "$var_value" == '""' ]; then - sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + # Remove value from configuration parameter in case of set to double quoted parameter value + if [[ "$var_value" == '""' ]]; then + if [ "$(grep -E "^$var_name=" $config_path)" ]; then + sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + else + sed -i -e "/^[#;] $var_name=/s/.*/&\n$var_name=/" "$config_path" + fi echo "undefined" return fi @@ -154,12 +158,12 @@ file_process_from_env() { # Check prerequisites for PostgreSQL database check_variables_postgresql() { + : ${DB_SERVER_HOST="postgres-server"} + : ${DB_SERVER_PORT:="5432"} + file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} - : ${DB_SERVER_PORT:="5432"} - DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"} DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""} @@ -171,12 +175,24 @@ check_variables_postgresql() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + DB_SERVER_HOST='""' + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect_postgresql() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" - echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + if [[ "$DB_SERVER_HOST" != '""' ]]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" if [ "${DEBUG_MODE,,}" == "true" ]; then @@ -206,8 +222,8 @@ check_db_connect_postgresql() { while true : do - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT @@ -244,7 +260,7 @@ psql_query() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - result=$(psql --no-align --quiet --tuples-only --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + result=$(psql --no-align --quiet --tuples-only $psql_connect_args \ --username "${DB_SERVER_ROOT_USER}" --command "$query" --dbname "$db" 2>/dev/null); unset PGPASSWORD @@ -284,7 +300,7 @@ exec_sql_file() { fi $command $sql_script | psql --quiet \ - --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + $psql_connect_args \ --username "${DB_SERVER_ZBX_USER}" --dbname "${DB_SERVER_DBNAME}" 1>/dev/null || exit 1 unset PGPASSWORD @@ -318,7 +334,7 @@ create_db_database_postgresql() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - createdb --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" --username "${DB_SERVER_ROOT_USER}" \ + createdb $psql_connect_args --username "${DB_SERVER_ROOT_USER}" \ --owner "${DB_SERVER_ZBX_USER}" --lc-ctype "en_US.utf8" --lc-collate "en_US.utf8" "${DB_SERVER_DBNAME}" unset PGPASSWORD diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh index 4dda1c392..2e3b0b7e7 100755 --- a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh @@ -87,16 +87,20 @@ update_config_var() { echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..." fi - # Remove configuration parameter definition in case of unset parameter value + # Remove configuration parameter definition in case of unset or empty parameter value if [ -z "$var_value" ]; then sed -i -e "/^$var_name=/d" "$config_path" echo "removed" return fi - # Remove value from configuration parameter in case of double quoted parameter value - if [ "$var_value" == '""' ]; then - sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + # Remove value from configuration parameter in case of set to double quoted parameter value + if [[ "$var_value" == '""' ]]; then + if [ "$(grep -E "^$var_name=" $config_path)" ]; then + sed -i -e "/^$var_name=/s/=.*/=/" "$config_path" + else + sed -i -e "/^[#;] $var_name=/s/.*/&\n$var_name=/" "$config_path" + fi echo "undefined" return fi @@ -154,12 +158,12 @@ file_process_from_env() { # Check prerequisites for PostgreSQL database check_variables_postgresql() { + : ${DB_SERVER_HOST="postgres-server"} + : ${DB_SERVER_PORT:="5432"} + file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} - : ${DB_SERVER_PORT:="5432"} - DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"} DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""} @@ -171,12 +175,24 @@ check_variables_postgresql() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + DB_SERVER_HOST='""' + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect_postgresql() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" - echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + if [[ "$DB_SERVER_HOST" != '""' ]]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" if [ "${DEBUG_MODE,,}" == "true" ]; then @@ -206,8 +222,8 @@ check_db_connect_postgresql() { while true : do - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break - psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --quiet 1>/dev/null 2>&1 && break + psql $psql_connect_args --username ${DB_SERVER_ROOT_USER} --list --dbname ${DB_SERVER_DBNAME} --quiet 1>/dev/null 2>&1 && break echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT @@ -244,7 +260,7 @@ psql_query() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - result=$(psql --no-align --quiet --tuples-only --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + result=$(psql --no-align --quiet --tuples-only $psql_connect_args \ --username "${DB_SERVER_ROOT_USER}" --command "$query" --dbname "$db" 2>/dev/null); unset PGPASSWORD @@ -284,7 +300,7 @@ exec_sql_file() { fi $command $sql_script | psql --quiet \ - --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \ + $psql_connect_args \ --username "${DB_SERVER_ZBX_USER}" --dbname "${DB_SERVER_DBNAME}" 1>/dev/null || exit 1 unset PGPASSWORD @@ -318,7 +334,7 @@ create_db_database_postgresql() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - createdb --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" --username "${DB_SERVER_ROOT_USER}" \ + createdb $psql_connect_args --username "${DB_SERVER_ROOT_USER}" \ --owner "${DB_SERVER_ZBX_USER}" --lc-ctype "en_US.utf8" --lc-collate "en_US.utf8" "${DB_SERVER_DBNAME}" unset PGPASSWORD diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index 90fbcbafc..f18436f9f 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -64,7 +64,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -75,11 +75,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -108,7 +120,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh index b44b5abd8..d90d37a73 100755 --- a/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh @@ -64,7 +64,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -75,11 +75,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -108,7 +120,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh index b44b5abd8..d90d37a73 100755 --- a/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh @@ -64,7 +64,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -75,11 +75,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -108,7 +120,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 7945b4783..649096227 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -64,7 +64,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -75,11 +75,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -108,7 +120,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index 22fd9af77..218880888 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -67,7 +67,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -78,11 +78,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -111,7 +123,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh index 33073e4f1..2703c7bc9 100755 --- a/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -67,7 +67,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -78,11 +78,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -111,7 +123,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh index 33073e4f1..2703c7bc9 100755 --- a/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh @@ -67,7 +67,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -78,11 +78,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -111,7 +123,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index f00f77d43..0f6cd4d57 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -67,7 +67,7 @@ check_variables() { file_env POSTGRES_USER file_env POSTGRES_PASSWORD - : ${DB_SERVER_HOST:="postgres-server"} + : ${DB_SERVER_HOST="postgres-server"} : ${DB_SERVER_PORT:="5432"} DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"} @@ -78,11 +78,23 @@ check_variables() { DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"} : ${POSTGRES_USE_IMPLICIT_SEARCH_PATH:="false"} + + if [ -n "${DB_SERVER_HOST}" ]; then + psql_connect_args="--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT}" + else + psql_connect_args="--port ${DB_SERVER_PORT}" + fi } check_db_connect() { echo "********************" - echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + if [ -n "${DB_SERVER_HOST}" ]; then + echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + else + echo "* DB_SERVER_HOST: Using DB socket" + echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" + fi echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}" echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}" echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}" @@ -111,7 +123,7 @@ check_db_connect() { export PGSSLKEY=${ZBX_DBTLSKEYFILE} fi - while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do + while [ ! "$(psql $psql_connect_args --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; do echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." sleep $WAIT_TIMEOUT done diff --git a/compose_databases.yaml b/compose_databases.yaml index 5ea68d29f..d2d6a92e3 100644 --- a/compose_databases.yaml +++ b/compose_databases.yaml @@ -17,7 +17,7 @@ services: volumes: - ${DATA_DIRECTORY}/var/lib/mysql:/var/lib/mysql:rw - ${ENV_VARS_DIRECTORY}/mysql_init/init_proxy_db.sql:/docker-entrypoint-initdb.d/mysql_init_proxy.sql:ro -# - dbsocket:/var/run/mysqld/ +# - mysql_socket:/var/run/mysqld/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql - path: ${ENV_VARS_DIRECTORY}/.env_db_mysql_override @@ -47,6 +47,7 @@ services: - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro +# - pgsql_socket:/var/run/postgresql/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_pgsql - path: ${ENV_VARS_DIRECTORY}/.env_db_pgsql_override diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index 4abd6aa4a..cd450e993 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -64,7 +64,7 @@ services: extends: service: server # volumes: -# - dbsocket:/var/run/mysqld/ +# - mysql_socket:/var/run/mysqld/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql secrets: @@ -88,6 +88,7 @@ services: # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - pgsql_socket:/var/run/postgresql env_file: - ${ENV_VARS_DIRECTORY}/.env_db_pgsql secrets: @@ -177,7 +178,7 @@ services: protocol: tcp app_protocol: zabbix-trapper # volumes: -# - dbsocket:/var/run/mysqld/ +# - mysql_socket:/var/run/mysqld/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql_proxy - ${ENV_VARS_DIRECTORY}/.env_prx_mysql @@ -255,7 +256,7 @@ services: extends: service: web-apache # volumes: -# - dbsocket:/var/run/mysqld/ +# - mysql_socket:/var/run/mysqld/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql secrets: @@ -275,6 +276,7 @@ services: # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - pgsql_socket:/var/run/postgresql env_file: - ${ENV_VARS_DIRECTORY}/.env_db_pgsql secrets: @@ -341,7 +343,7 @@ services: extends: service: web-nginx # volumes: -# - dbsocket:/var/run/mysqld/ +# - mysql_socket:/var/run/mysqld/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql secrets: @@ -365,6 +367,7 @@ services: # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/client-key.pem:ro +# - pgsql_socket:/var/run/postgresql env_file: - ${ENV_VARS_DIRECTORY}/.env_db_pgsql secrets: diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 12104fef4..beecffec3 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -126,7 +126,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 3ef62bfec..757403628 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -218,7 +218,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index d99fabccc..72cea9716 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -140,7 +140,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 1534af1ae..9cf172260 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -246,7 +246,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index cdf7cfb3b..b948b1571 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -126,7 +126,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index d79304d9f..2813f3ba5 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -219,7 +219,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 68c1b39a7..717be11f9 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -140,7 +140,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 643ccd727..177a925a9 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -246,7 +246,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index 7a4cc1fe1..e8535be68 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -126,7 +126,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 73389154a..939728234 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -219,7 +219,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index 1b2e20898..16340893a 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -140,7 +140,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index 5dbebea13..aa76b9d04 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -246,7 +246,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index 1b7905c88..16736b742 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -114,7 +114,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index c3f61dd33..98382a7b4 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -207,7 +207,7 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index b95f1bde1..063a6c400 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -128,7 +128,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index f313a45c1..eaf34c895 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -234,7 +234,8 @@ networks: volumes: snmptraps: -# dbsocket: +# mysql_socket: +# pgsql_socket: secrets: MYSQL_USER: