mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-06-22 10:51:36 +02:00
Fixed images dependencies in PostgreSQL variant compose files
This commit is contained in:
parent
f4a091554f
commit
80a2dc4e87
@ -161,7 +161,7 @@ services:
|
|||||||
- "${ALPINE_BASE_IMAGE}"
|
- "${ALPINE_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
|
OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-agent:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
@ -180,7 +180,7 @@ services:
|
|||||||
- "${ALPINE_BASE_IMAGE}"
|
- "${ALPINE_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
|
OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-java-gateway:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
@ -211,7 +211,7 @@ services:
|
|||||||
- "${ALPINE_BASE_IMAGE}"
|
- "${ALPINE_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
|
OS_BASE_IMAGE: ${ALPINE_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-web-service:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
|
@ -161,7 +161,7 @@ services:
|
|||||||
- "${CENTOS_BASE_IMAGE}"
|
- "${CENTOS_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
|
OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-agent:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
@ -180,7 +180,7 @@ services:
|
|||||||
- "${CENTOS_BASE_IMAGE}"
|
- "${CENTOS_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
|
OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-java-gateway:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
@ -211,7 +211,7 @@ services:
|
|||||||
- "${CENTOS_BASE_IMAGE}"
|
- "${CENTOS_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
|
OS_BASE_IMAGE: ${CENTOS_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-web-service:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
|
@ -161,7 +161,7 @@ services:
|
|||||||
- "${OL_BASE_IMAGE}"
|
- "${OL_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${OL_BASE_IMAGE}
|
OS_BASE_IMAGE: ${OL_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-agent:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
@ -180,7 +180,7 @@ services:
|
|||||||
- "${OL_BASE_IMAGE}"
|
- "${OL_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${OL_BASE_IMAGE}
|
OS_BASE_IMAGE: ${OL_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-java-gateway:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
@ -211,7 +211,7 @@ services:
|
|||||||
- "${OL_BASE_IMAGE}"
|
- "${OL_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${OL_BASE_IMAGE}
|
OS_BASE_IMAGE: ${OL_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-web-service:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
|
@ -152,7 +152,7 @@ services:
|
|||||||
- "${UBUNTU_BASE_IMAGE}"
|
- "${UBUNTU_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
|
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-agent:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
@ -169,7 +169,7 @@ services:
|
|||||||
- "${UBUNTU_BASE_IMAGE}"
|
- "${UBUNTU_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
|
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-java-gateway:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
@ -200,7 +200,7 @@ services:
|
|||||||
- "${UBUNTU_BASE_IMAGE}"
|
- "${UBUNTU_BASE_IMAGE}"
|
||||||
args:
|
args:
|
||||||
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
|
OS_BASE_IMAGE: ${UBUNTU_BASE_IMAGE}
|
||||||
BUILD_BASE_IMAGE: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
BUILD_BASE_IMAGE: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
image: zabbix-web-service:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
image: zabbix-web-service:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}
|
||||||
depends_on:
|
depends_on:
|
||||||
- zabbix-build-pgsql
|
- zabbix-build-pgsql
|
||||||
|
Loading…
x
Reference in New Issue
Block a user