extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-20 05:11:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed PostgreSQL availability check

Browse Source
This commit is contained in:
Alexey Pustovalov
2020-07-29 23:10:48 -04:00
parent 7436513ee1
commit 17451c107f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server-pgsql/alpine/docker-entrypoint.sh
View File

@@ -186,7 +186,7 @@ check_db_connect_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 2>/dev/null)" ]; do while [ ! "$(pg_isready --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --quiet 2>/dev/null && echo $?)" ]; do
echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
sleep $WAIT_TIMEOUT sleep $WAIT_TIMEOUT
done done
@@ -204,7 +204,7 @@ psql_query() {
if [ -n "${DB_SERVER_ZBX_PASS}" ]; then if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
export PGPASSWORD="${DB_SERVER_ZBX_PASS}" export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
fi fi
if [ -n "${DB_SERVER_SCHEMA}" ]; then if [ -n "${DB_SERVER_SCHEMA}" ]; then
PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}" PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
export PGOPTIONS export PGOPTIONS
@@ -269,7 +269,7 @@ create_db_schema_postgresql() {
zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \ zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \
--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \
--username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null || exit 1
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS

4
server-pgsql/centos/docker-entrypoint.sh
View File

@@ -186,7 +186,7 @@ check_db_connect_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 2>/dev/null)" ]; do while [ ! "$(pg_isready --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --quiet 2>/dev/null && echo $?)" ]; do
echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
sleep $WAIT_TIMEOUT sleep $WAIT_TIMEOUT
done done
@@ -269,7 +269,7 @@ create_db_schema_postgresql() {
zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \ zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \
--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \
--username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null || exit 1
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS

4
server-pgsql/ubuntu/docker-entrypoint.sh
View File

@@ -186,7 +186,7 @@ check_db_connect_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 2>/dev/null)" ]; do while [ ! "$(pg_isready --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --quiet 2>/dev/null && echo $?)" ]; do
echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..." echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
sleep $WAIT_TIMEOUT sleep $WAIT_TIMEOUT
done done
@@ -269,7 +269,7 @@ create_db_schema_postgresql() {
zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \ zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \
--host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \
--username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null || exit 1
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS