mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-04-30 22:24:26 +02:00
Fixed PostgreSQL availability check
This commit is contained in:
commit
a4804f5e4c
@ -27,11 +27,19 @@ RUN set -eux && \
|
|||||||
libldap \
|
libldap \
|
||||||
libcurl \
|
libcurl \
|
||||||
openssl-libs && \
|
openssl-libs && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
yum -y clean all && \
|
yum -y clean all && \
|
||||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||||
|
@ -35,11 +35,19 @@ RUN set -eux && \
|
|||||||
libssl1.1 \
|
libssl1.1 \
|
||||||
libcurl4 \
|
libcurl4 \
|
||||||
libldap-2.4 && \
|
libldap-2.4 && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
||||||
apt-get -y autoremove && \
|
apt-get -y autoremove && \
|
||||||
|
@ -43,11 +43,19 @@ RUN set -eux && \
|
|||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre \
|
pcre \
|
||||||
unixODBC && \
|
unixODBC && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
yum -y clean all && \
|
yum -y clean all && \
|
||||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||||
|
@ -53,11 +53,19 @@ RUN set -eux && \
|
|||||||
mysql-client \
|
mysql-client \
|
||||||
snmp-mibs-downloader \
|
snmp-mibs-downloader \
|
||||||
unixodbc && \
|
unixodbc && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
||||||
apt-get -y autoremove && \
|
apt-get -y autoremove && \
|
||||||
|
@ -42,11 +42,19 @@ RUN set -eux && \
|
|||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre \
|
pcre \
|
||||||
unixODBC && \
|
unixODBC && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
yum -y clean all && \
|
yum -y clean all && \
|
||||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||||
|
@ -51,11 +51,19 @@ RUN set -eux && \
|
|||||||
libxml2 \
|
libxml2 \
|
||||||
snmp-mibs-downloader \
|
snmp-mibs-downloader \
|
||||||
unixodbc && \
|
unixodbc && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
||||||
apt-get -y autoremove && \
|
apt-get -y autoremove && \
|
||||||
|
@ -47,11 +47,19 @@ RUN set -eux && \
|
|||||||
openssl-libs \
|
openssl-libs \
|
||||||
pcre \
|
pcre \
|
||||||
unixODBC && \
|
unixODBC && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
yum -y clean all && \
|
yum -y clean all && \
|
||||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||||
|
@ -57,11 +57,19 @@ RUN set -eux && \
|
|||||||
mysql-client \
|
mysql-client \
|
||||||
snmp-mibs-downloader \
|
snmp-mibs-downloader \
|
||||||
unixodbc && \
|
unixodbc && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
||||||
apt-get -y autoremove && \
|
apt-get -y autoremove && \
|
||||||
|
@ -196,7 +196,7 @@ check_db_connect_postgresql() {
|
|||||||
export PGSSLKEY=${ZBX_DBTLSKEYFILE}
|
export PGSSLKEY=${ZBX_DBTLSKEYFILE}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
while [ ! "$(psql "$ssl_opts" --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
|
||||||
|
@ -48,11 +48,19 @@ RUN set -eux && \
|
|||||||
postgresql \
|
postgresql \
|
||||||
postgresql-libs \
|
postgresql-libs \
|
||||||
unixODBC && \
|
unixODBC && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
yum -y clean all && \
|
yum -y clean all && \
|
||||||
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
|
||||||
|
@ -196,7 +196,7 @@ check_db_connect_postgresql() {
|
|||||||
export PGSSLKEY=${ZBX_DBTLSKEYFILE}
|
export PGSSLKEY=${ZBX_DBTLSKEYFILE}
|
||||||
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
|
||||||
@ -305,12 +305,12 @@ 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
|
||||||
|
|
||||||
if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then
|
if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then
|
||||||
cat /usr/share/doc/zabbix-server-postgresql/timescaledb.sql | psql --quiet \
|
cat /usr/share/doc/zabbix-server-postgresql/timescaledb.sql | 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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
unset PGPASSWORD
|
unset PGPASSWORD
|
||||||
|
@ -57,11 +57,19 @@ RUN set -eux && \
|
|||||||
postgresql-client \
|
postgresql-client \
|
||||||
snmp-mibs-downloader \
|
snmp-mibs-downloader \
|
||||||
unixodbc && \
|
unixodbc && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini -o /sbin/tini && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
|
||||||
curl -L https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc -o /tini.asc && \
|
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
|
||||||
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --batch --verify /tini.asc /sbin/tini && \
|
for server in $(shuf -e ha.pool.sks-keyservers.net \
|
||||||
rm -rf /root/.gnupg && \
|
hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
|
ipv4.pool.sks-keyservers.net \
|
||||||
|
keyserver.ubuntu.com \
|
||||||
|
keyserver.pgp.com \
|
||||||
|
pgp.mit.edu) ; do \
|
||||||
|
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
|
||||||
|
done && \
|
||||||
|
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
|
||||||
|
rm -r "$GNUPGHOME" /tmp/tini.asc && \
|
||||||
chmod +x /sbin/tini && \
|
chmod +x /sbin/tini && \
|
||||||
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
apt-get -y purge curl gpg dirmngr gpg-agent && \
|
||||||
apt-get -y autoremove && \
|
apt-get -y autoremove && \
|
||||||
|
@ -196,7 +196,7 @@ check_db_connect_postgresql() {
|
|||||||
export PGSSLKEY=${ZBX_DBTLSKEYFILE}
|
export PGSSLKEY=${ZBX_DBTLSKEYFILE}
|
||||||
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
|
||||||
@ -305,12 +305,12 @@ 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
|
||||||
|
|
||||||
if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then
|
if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then
|
||||||
cat /usr/share/doc/zabbix-server-postgresql/timescaledb.sql | psql --quiet \
|
cat /usr/share/doc/zabbix-server-postgresql/timescaledb.sql | 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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
unset PGPASSWORD
|
unset PGPASSWORD
|
||||||
|
Loading…
Reference in New Issue
Block a user