extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-19 17:38:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed PostgreSQL availability command

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-06-22 20:58:17 +03:00
parent 8bff463034
commit e1abf0b307
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,7 @@ check_db_connect_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 2>/dev/null)" ]; 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,8 +204,8 @@ psql_query() {
export PGOPTIONS export PGOPTIONS
fi fi
result=$(psql -A -q -t -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \ result=$(psql --no-align --quiet --tuples-only --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \
-U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null); --username "${DB_SERVER_ROOT_USER}" --command "$query" --dbname "$db" 2>/dev/null);
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS
@ -261,9 +261,9 @@ create_db_schema_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql -q \ zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \
-h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \
-U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS

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

@ -180,7 +180,7 @@ check_db_connect_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 2>/dev/null)" ]; 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,8 +204,8 @@ psql_query() {
export PGOPTIONS export PGOPTIONS
fi fi
result=$(psql -A -q -t -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \ result=$(psql --no-align --quiet --tuples-only --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \
-U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null); --username "${DB_SERVER_ROOT_USER}" --command "$query" --dbname "$db" 2>/dev/null);
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS
@ -261,9 +261,9 @@ create_db_schema_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql -q \ zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \
-h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \
-U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS

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

@ -180,7 +180,7 @@ check_db_connect_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --list --quiet 2>/dev/null)" ]; 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,8 +204,8 @@ psql_query() {
export PGOPTIONS export PGOPTIONS
fi fi
result=$(psql -A -q -t -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \ result=$(psql --no-align --quiet --tuples-only --host "${DB_SERVER_HOST}" --port "${DB_SERVER_PORT}" \
-U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null); --username "${DB_SERVER_ROOT_USER}" --command "$query" --dbname "$db" 2>/dev/null);
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS
@ -261,9 +261,9 @@ create_db_schema_postgresql() {
export PGOPTIONS export PGOPTIONS
fi fi
zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql -q \ zcat /usr/share/doc/zabbix-server-postgresql/create.sql.gz | psql --quiet \
-h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \ --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} \
-U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null --username ${DB_SERVER_ZBX_USER} --dbname ${DB_SERVER_DBNAME} 1>/dev/null
unset PGPASSWORD unset PGPASSWORD
unset PGOPTIONS unset PGOPTIONS

2
web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -170,7 +170,7 @@ check_db_connect() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; 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

2
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -171,7 +171,7 @@ check_db_connect() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; 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

2
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -171,7 +171,7 @@ check_db_connect() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; 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

2
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -188,7 +188,7 @@ check_db_connect() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; 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

2
web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -188,7 +188,7 @@ check_db_connect() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; 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

2
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -188,7 +188,7 @@ check_db_connect() {
export PGOPTIONS export PGOPTIONS
fi fi
while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do while [ ! "$(psql --host ${DB_SERVER_HOST} --port ${DB_SERVER_PORT} --username ${DB_SERVER_ROOT_USER} --dbname ${DB_SERVER_DBNAME} --list --quiet 2>/dev/null)" ]; 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