extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-26 21:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: test ENV existence before exporting to config

Browse Source 
- test `DB_SERVER_SOCKET` before set `ZBX_DB_SOCKET`
- test `DB_SERVER_HOST` before set `ZBX_DB_HOST`
- test `DB_SERVER_PORT` before set `ZBX_DB_PORT`
- remove trailing spaces in `docker-entrypoint.sh` files
This commit is contained in:
Marks Sunins 2025-05-09 09:48:56 +00:00
parent 488dc0a1fd
commit 7241127870
No known key found for this signature in database
GPG Key ID: BADED4DBFD15F1A2
13 changed files with 43 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
View File

@ -349,11 +349,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
View File

@ -346,11 +346,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
View File

@ -346,11 +346,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
View File

@ -346,11 +346,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
View File

@ -346,11 +346,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
View File

@ -362,11 +362,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/server-mysql/centos/docker-entrypoint.sh
View File

@ -359,11 +359,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/server-mysql/ol/docker-entrypoint.sh
View File

@ -359,11 +359,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

9
Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
View File

@ -359,11 +359,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

2
Dockerfiles/server-mysql/ubuntu/Dockerfile
View File

@ -122,7 +122,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
EXPOSE 10051/TCP EXPOSE 10051/TCP
WORKDIR ${ZABBIX_USER_HOME_DIR} WORKDIR ${ZABBIX_USER_HOME_DIR}
VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"] VOLUME ["${ZABBIX_USER_HOME_DIR}/snmptraps", "${ZABBIX_USER_HOME_DIR}/export"]
COPY ["docker-entrypoint.sh", "/usr/bin/"] COPY ["docker-entrypoint.sh", "/usr/bin/"]

9
Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
View File

@ -359,11 +359,10 @@ create_db_schema_mysql() {
} }
update_zbx_config() { update_zbx_config() {
export ZBX_DB_HOST="${DB_SERVER_HOST}" test -z "${DB_SERVER_SOCKET}" || export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
export ZBX_DB_PORT="${DB_SERVER_PORT}" test -z "${DB_SERVER_HOST}" || export ZBX_DB_HOST="${DB_SERVER_HOST}"
if [ -n "${DB_SERVER_SOCKET}" ]; then test -z "${DB_SERVER_PORT}" || export ZBX_DB_PORT="${DB_SERVER_PORT}"
export ZBX_DB_SOCKET="${DB_SERVER_SOCKET}"
fi
export ZBX_DB_NAME="${DB_SERVER_DBNAME}" export ZBX_DB_NAME="${DB_SERVER_DBNAME}"
if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then if [ -n "${ZBX_VAULT}" ] && [ -n "${ZBX_VAULTURL}" ] && [ ! -n "${ZBX_VAULTDBPATH}" ]; then

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

@ -24,7 +24,7 @@ fi
# DefaultRuntimeDir configuration option value # DefaultRuntimeDir configuration option value
export APACHE_RUN_DIR="/tmp/apache2" export APACHE_RUN_DIR="/tmp/apache2"
# Default directories # Default directories
# Apache main configuration file # Apache main configuration file
HTTPD_CONF_FILE="/etc/apache2/httpd.conf" HTTPD_CONF_FILE="/etc/apache2/httpd.conf"

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

@ -24,7 +24,7 @@ fi
# DefaultRuntimeDir configuration option value # DefaultRuntimeDir configuration option value
export APACHE_RUN_DIR="/tmp/httpd" export APACHE_RUN_DIR="/tmp/httpd"
# Default directories # Default directories
# Apache main configuration file # Apache main configuration file
HTTPD_CONF_FILE="/etc/httpd/conf/httpd.conf" HTTPD_CONF_FILE="/etc/httpd/conf/httpd.conf"