From d9fcfbd2b0933d5ad5b3c704218f39456cb7a276 Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Mon, 30 May 2022 14:02:42 -0700 Subject: [PATCH] Release 7.6.3 - See CHANGELOG.md --- .dockerignore | 1 + CHANGELOG.md | 6 ++++++ Dockerfile | 2 +- install/assets/functions/00-container | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..d838da9 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +examples/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f53a4f..83820cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 7.6.3 2022-05-30 + + ### Added + - Zabbix Agent 6.0.5 + + ## 7.6.2 2022-05-24 ### Added diff --git a/Dockerfile b/Dockerfile index 599b3cc..964b9bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG ZABBIX_VERSION ### Set defaults ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"1.8.15"} \ S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.1.0.1"} \ - ZABBIX_VERSION=${ZABBIX_VERSION:-"6.0.4"} \ + ZABBIX_VERSION=${ZABBIX_VERSION:-"6.0.5"} \ DOAS_VERSION=${DOAS_VERSION:-"v6.8.2"} \ DEBUG_MODE=FALSE \ TIMEZONE=Etc/GMT \ diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container index 43e2b28..165ba65 100755 --- a/install/assets/functions/00-container +++ b/install/assets/functions/00-container @@ -238,7 +238,7 @@ db_ready() { ;; "pgsql" | "psql" | "postgres" | "postgresql" ) if [ -n "${DB_PORT}" ] ; then postgres_port=${DB_PORT} ; fi ; - if [ -n "${POSTGRES_PORT}" ] ; then postgres_port=${MYSQL_PORT} ; fi ; + if [ -n "${POSTGRES_PORT}" ] ; then postgres_port=${POSTGRES_PORT} ; fi ; postgres_port=${postgres_port:-5432} if [ -n "${DB_HOST}" ] ; then postgres_host=${DB_HOST} ; fi ; if [ -n "${POSTGRES_HOST}" ] ; then postgres_host=${POSTGRES_HOST} ; fi ;