From a745b0b1851f993c2b8d5c0a895c9979badfb99a Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 6 Feb 2024 17:16:51 +0900 Subject: [PATCH] Fixed circular reference error --- compose_zabbix_components.yaml | 48 +++++++++++----------- docker-compose_v3_alpine_mysql_latest.yaml | 18 ++++---- docker-compose_v3_alpine_mysql_local.yaml | 18 ++++---- docker-compose_v3_alpine_pgsql_latest.yaml | 18 ++++---- docker-compose_v3_alpine_pgsql_local.yaml | 18 ++++---- docker-compose_v3_centos_mysql_latest.yaml | 18 ++++---- docker-compose_v3_centos_mysql_local.yaml | 18 ++++---- docker-compose_v3_centos_pgsql_latest.yaml | 18 ++++---- docker-compose_v3_centos_pgsql_local.yaml | 18 ++++---- docker-compose_v3_ol_mysql_latest.yaml | 18 ++++---- docker-compose_v3_ol_mysql_local.yaml | 18 ++++---- docker-compose_v3_ol_pgsql_latest.yaml | 18 ++++---- docker-compose_v3_ol_pgsql_local.yaml | 18 ++++---- docker-compose_v3_ubuntu_mysql_latest.yaml | 18 ++++---- docker-compose_v3_ubuntu_mysql_local.yaml | 18 ++++---- docker-compose_v3_ubuntu_pgsql_latest.yaml | 18 ++++---- docker-compose_v3_ubuntu_pgsql_local.yaml | 18 ++++---- 17 files changed, 168 insertions(+), 168 deletions(-) diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index 0a06f2cfc..9422536d6 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -1,6 +1,6 @@ version: '3.8' services: - zabbix-server: + server: init: true ports: - "${ZABBIX_SERVER_PORT}:10051" @@ -55,9 +55,9 @@ services: com.zabbix.company: "Zabbix LLC" com.zabbix.component: "zabbix-server" - zabbix-server-mysql: + server-mysql: extends: - service: zabbix-server + service: server # volumes: # - dbsocket:/var/run/mysqld/ env_file: @@ -76,9 +76,9 @@ services: com.zabbix.description: "Zabbix server with MySQL database support" com.zabbix.dbtype: "mysql" - zabbix-server-pgsql: + server-pgsql: extends: - service: zabbix-server + service: server # volumes: # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro @@ -96,7 +96,7 @@ services: com.zabbix.description: "Zabbix server with PostgreSQL database support" com.zabbix.dbtype: "pgsql" - zabbix-proxy: + proxy: init: true profiles: - all @@ -141,9 +141,9 @@ services: com.zabbix.company: "Zabbix LLC" com.zabbix.component: "zabbix-proxy" - zabbix-proxy-sqlite3: + proxy-sqlite3: extends: - service: zabbix-proxy + service: proxy ports: - "${ZABBIX_PROXY_SQLITE3_PORT}:10051" env_file: @@ -156,9 +156,9 @@ services: com.zabbix.description: "Zabbix proxy with SQLite3 database support" com.zabbix.dbtype: "sqlite3" - zabbix-proxy-mysql: + proxy-mysql: extends: - service: zabbix-proxy + service: proxy ports: - "${ZABBIX_PROXY_MYSQL_PORT}:10051" # volumes: @@ -183,7 +183,7 @@ services: com.zabbix.description: "Zabbix proxy with MySQL database support" com.zabbix.dbtype: "mysql" - zabbix-web-apache: + web-apache: profiles: - all ports: @@ -223,9 +223,9 @@ services: com.zabbix.component: "zabbix-frontend" com.zabbix.webserver: "apache2" - zabbix-web-apache-mysql: + web-apache-mysql: extends: - service: zabbix-web-apache + service: web-apache # volumes: # - dbsocket:/var/run/mysqld/ env_file: @@ -242,7 +242,7 @@ services: zabbix-web-apache-pgsql: extends: - service: zabbix-web-apache + service: web-apache # volumes: # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro @@ -260,7 +260,7 @@ services: com.zabbix.description: "Zabbix frontend on Apache web-server with PostgreSQL database support" com.zabbix.dbtype: "pgsql" - zabbix-web-nginx: + web-nginx: ports: - "${ZABBIX_WEB_NGINX_HTTP_PORT}:8080" - "${ZABBIX_WEB_NGINX_HTTPS_PORT}:8443" @@ -298,9 +298,9 @@ services: com.zabbix.component: "zabbix-frontend" com.zabbix.webserver: "nginx" - zabbix-web-nginx-mysql: + web-nginx-mysql: extends: - service: zabbix-web-nginx + service: web-nginx # volumes: # - dbsocket:/var/run/mysqld/ env_file: @@ -319,9 +319,9 @@ services: com.zabbix.description: "Zabbix frontend on Nginx web-server with MySQL database support" com.zabbix.dbtype: "mysql" - zabbix-web-nginx-pgsql: + web-nginx-pgsql: extends: - service: zabbix-web-nginx + service: web-nginx # volumes: # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro # - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/client-cert.pem:ro @@ -339,7 +339,7 @@ services: com.zabbix.description: "Zabbix frontend on Nginx web-server with PostgreSQL database support" com.zabbix.dbtype: "pgsql" - zabbix-agent: + agent: init: true profiles: - full @@ -378,7 +378,7 @@ services: com.zabbix.company: "Zabbix LLC" com.zabbix.component: "zabbix-agentd" - zabbix-agent2: + agent2: init: true profiles: - full @@ -417,7 +417,7 @@ services: com.zabbix.company: "Zabbix LLC" com.zabbix.component: "zabbix-agent2" - zabbix-java-gateway: + java-gateway: profiles: - full - all @@ -444,7 +444,7 @@ services: com.zabbix.company: "Zabbix LLC" com.zabbix.component: "java-gateway" - zabbix-snmptraps: + snmptraps: # Override snmptrapd command arguments to receive SNMP traps by DNS # It must be done with ZBX_SNMP_TRAP_USE_DNS=true environment variable # command: /usr/sbin/snmptrapd -C -c /etc/snmp/snmptrapd.conf -Lo -A @@ -478,7 +478,7 @@ services: com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - zabbix-web-service: + web-service: profiles: - full - all diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index 4acb2b114..d269ee6eb 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql image: "${ZABBIX_SERVER_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -15,7 +15,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -25,7 +25,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -37,7 +37,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql image: "${ZABBIX_WEB_APACHE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -49,7 +49,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql image: "${ZABBIX_WEB_NGINX_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -61,7 +61,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -71,7 +71,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${ALPINE_OS_TAG}" @@ -79,7 +79,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${ALPINE_OS_TAG}" @@ -87,7 +87,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${ALPINE_OS_TAG}" diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 7f7e65eb6..85dc45bc3 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -34,7 +34,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql build: context: ./Dockerfiles/server-mysql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -53,7 +53,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT} cache_from: @@ -71,7 +71,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -90,7 +90,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql build: context: ./Dockerfiles/web-apache-mysql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -109,7 +109,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql build: context: ./Dockerfiles/web-nginx-mysql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -128,7 +128,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT} cache_from: @@ -146,7 +146,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT} cache_from: @@ -162,7 +162,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT} cache_from: @@ -176,7 +176,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${ALPINE_OS_TAG_SHORT} cache_from: diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index e0b300ea4..bc4892246 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql image: "${ZABBIX_SERVER_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -15,7 +15,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -25,7 +25,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -37,7 +37,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql image: "${ZABBIX_WEB_APACHE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -49,7 +49,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql image: "${ZABBIX_WEB_NGINX_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -61,7 +61,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -71,7 +71,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${ALPINE_OS_TAG}" @@ -79,7 +79,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${ALPINE_OS_TAG}" @@ -87,7 +87,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${ALPINE_OS_TAG}" diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 398180e98..ae96aa01a 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -47,7 +47,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql build: context: ./Dockerfiles/server-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -66,7 +66,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${ALPINE_OS_TAG_SHORT} cache_from: @@ -84,7 +84,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -103,7 +103,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql build: context: ./Dockerfiles/web-apache-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -122,7 +122,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql build: context: ./Dockerfiles/web-nginx-pgsql/${ALPINE_OS_TAG_SHORT} cache_from: @@ -141,7 +141,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${ALPINE_OS_TAG_SHORT} cache_from: @@ -159,7 +159,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${ALPINE_OS_TAG_SHORT} cache_from: @@ -175,7 +175,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${ALPINE_OS_TAG_SHORT} cache_from: @@ -189,7 +189,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${ALPINE_OS_TAG_SHORT} cache_from: diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index a6ebaedef..ff4d42540 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql image: "${ZABBIX_SERVER_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -15,7 +15,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -25,7 +25,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -37,7 +37,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql image: "${ZABBIX_WEB_APACHE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -49,7 +49,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql image: "${ZABBIX_WEB_NGINX_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -61,7 +61,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -71,7 +71,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${CENTOS_OS_TAG}" @@ -79,7 +79,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${CENTOS_OS_TAG}" @@ -87,7 +87,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${CENTOS_OS_TAG}" diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index 7dab7e0d7..2540b233f 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -34,7 +34,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql build: context: ./Dockerfiles/server-mysql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -54,7 +54,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT} cache_from: @@ -72,7 +72,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -91,7 +91,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql build: context: ./Dockerfiles/web-apache-mysql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -110,7 +110,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql build: context: ./Dockerfiles/web-nginx-mysql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -129,7 +129,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT} cache_from: @@ -147,7 +147,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT} cache_from: @@ -163,7 +163,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: @@ -177,7 +177,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${CENTOS_OS_TAG_SHORT} cache_from: diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index 0f378240e..81c0b4d80 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql image: "${ZABBIX_SERVER_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -15,7 +15,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -25,7 +25,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -37,7 +37,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql image: "${ZABBIX_WEB_APACHE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -49,7 +49,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql image: "${ZABBIX_WEB_NGINX_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -61,7 +61,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -71,7 +71,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${CENTOS_OS_TAG}" @@ -79,7 +79,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${CENTOS_OS_TAG}" @@ -87,7 +87,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${CENTOS_OS_TAG}" diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 40bb1cc56..394eca23b 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -47,7 +47,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql build: context: ./Dockerfiles/server-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -66,7 +66,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${CENTOS_OS_TAG_SHORT} cache_from: @@ -84,7 +84,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -103,7 +103,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql build: context: ./Dockerfiles/web-apache-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -122,7 +122,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql build: context: ./Dockerfiles/web-nginx-pgsql/${CENTOS_OS_TAG_SHORT} cache_from: @@ -141,7 +141,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${CENTOS_OS_TAG_SHORT} cache_from: @@ -159,7 +159,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${CENTOS_OS_TAG_SHORT} cache_from: @@ -175,7 +175,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${CENTOS_OS_TAG_SHORT} cache_from: @@ -189,7 +189,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${CENTOS_OS_TAG_SHORT} cache_from: diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index 4dedf576b..a450cd1f1 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql image: "${ZABBIX_SERVER_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -15,7 +15,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -25,7 +25,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -37,7 +37,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql image: "${ZABBIX_WEB_APACHE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -49,7 +49,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql image: "${ZABBIX_WEB_NGINX_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -61,7 +61,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -71,7 +71,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${OL_OS_TAG}" @@ -79,7 +79,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${OL_OS_TAG}" @@ -87,7 +87,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${OL_OS_TAG}" diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 17bc182d3..b2a4818b3 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -34,7 +34,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql build: context: ./Dockerfiles/server-mysql/${OL_OS_TAG_SHORT} cache_from: @@ -54,7 +54,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT} cache_from: @@ -72,7 +72,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT} cache_from: @@ -91,7 +91,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql build: context: ./Dockerfiles/web-apache-mysql/${OL_OS_TAG_SHORT} cache_from: @@ -110,7 +110,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql build: context: ./Dockerfiles/web-nginx-mysql/${OL_OS_TAG_SHORT} cache_from: @@ -129,7 +129,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT} cache_from: @@ -147,7 +147,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT} cache_from: @@ -163,7 +163,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: @@ -177,7 +177,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${OL_OS_TAG_SHORT} cache_from: diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index f87eaad61..938fbd49b 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql image: "${ZABBIX_SERVER_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -15,7 +15,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -25,7 +25,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -37,7 +37,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql image: "${ZABBIX_WEB_APACHE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -49,7 +49,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql image: "${ZABBIX_WEB_NGINX_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -61,7 +61,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" volumes: - /etc/timezone:/etc/timezone:ro @@ -71,7 +71,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${OL_OS_TAG}" @@ -79,7 +79,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${OL_OS_TAG}" @@ -87,7 +87,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${OL_OS_TAG}" diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index 5683ce69f..d67689b0b 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -47,7 +47,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql build: context: ./Dockerfiles/server-pgsql/${OL_OS_TAG_SHORT} cache_from: @@ -66,7 +66,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${OL_OS_TAG_SHORT} cache_from: @@ -84,7 +84,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${OL_OS_TAG_SHORT} cache_from: @@ -103,7 +103,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql build: context: ./Dockerfiles/web-apache-pgsql/${OL_OS_TAG_SHORT} cache_from: @@ -122,7 +122,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql build: context: ./Dockerfiles/web-nginx-pgsql/${OL_OS_TAG_SHORT} cache_from: @@ -141,7 +141,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${OL_OS_TAG_SHORT} cache_from: @@ -159,7 +159,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${OL_OS_TAG_SHORT} cache_from: @@ -175,7 +175,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${OL_OS_TAG_SHORT} cache_from: @@ -189,7 +189,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${OL_OS_TAG_SHORT} cache_from: diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index d0bdfa1f6..bd1ae5d1e 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql image: "${ZABBIX_SERVER_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - mysql-server @@ -13,7 +13,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -21,7 +21,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - mysql-server @@ -31,7 +31,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql image: "${ZABBIX_WEB_APACHE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - mysql-server @@ -41,7 +41,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql image: "${ZABBIX_WEB_NGINX_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - mysql-server @@ -51,7 +51,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -59,7 +59,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -67,7 +67,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -75,7 +75,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 372a57608..522692f0e 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -34,7 +34,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-mysql + service: server-mysql build: context: ./Dockerfiles/server-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -52,7 +52,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -68,7 +68,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -85,7 +85,7 @@ services: zabbix-web-apache-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-mysql + service: web-apache-mysql build: context: ./Dockerfiles/web-apache-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -102,7 +102,7 @@ services: zabbix-web-nginx-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-mysql + service: web-nginx-mysql build: context: ./Dockerfiles/web-nginx-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -119,7 +119,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -135,7 +135,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -151,7 +151,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -165,7 +165,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${UBUNTU_OS_TAG_SHORT} cache_from: diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 35c6e4e55..49622ebcc 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -3,7 +3,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql image: "${ZABBIX_SERVER_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - postgres-server @@ -13,7 +13,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 image: "${ZABBIX_PROXY_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -21,7 +21,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql image: "${ZABBIX_PROXY_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - mysql-server @@ -31,7 +31,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql image: "${ZABBIX_WEB_APACHE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - postgres-server @@ -41,7 +41,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql image: "${ZABBIX_WEB_NGINX_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" depends_on: - postgres-server @@ -51,7 +51,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent image: "${ZABBIX_AGENT_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -59,7 +59,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway image: "${ZABBIX_JAVA_GATEWAY_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -67,7 +67,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps image: "${ZABBIX_SNMPTRAPS_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" @@ -75,7 +75,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service image: "${ZABBIX_WEB_SERVICE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_IMAGE_TAG_POSTFIX}" labels: com.zabbix.os: "${UBUNTU_OS_TAG}" diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 35deae244..bda62455e 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -47,7 +47,7 @@ services: zabbix-server: extends: file: compose_zabbix_components.yaml - service: zabbix-server-pgsql + service: server-pgsql build: context: ./Dockerfiles/server-pgsql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -64,7 +64,7 @@ services: zabbix-proxy-sqlite3: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-sqlite3 + service: proxy-sqlite3 build: context: ./Dockerfiles/proxy-sqlite3/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -80,7 +80,7 @@ services: zabbix-proxy-mysql: extends: file: compose_zabbix_components.yaml - service: zabbix-proxy-mysql + service: proxy-mysql build: context: ./Dockerfiles/proxy-mysql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -97,7 +97,7 @@ services: zabbix-web-apache-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-apache-pgsql + service: web-apache-pgsql build: context: ./Dockerfiles/web-apache-pgsql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -114,7 +114,7 @@ services: zabbix-web-nginx-pgsql: extends: file: compose_zabbix_components.yaml - service: zabbix-web-nginx-pgsql + service: web-nginx-pgsql build: context: ./Dockerfiles/web-nginx-pgsql/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -131,7 +131,7 @@ services: zabbix-agent: extends: file: compose_zabbix_components.yaml - service: zabbix-agent + service: agent build: context: ./Dockerfiles/agent/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -147,7 +147,7 @@ services: zabbix-java-gateway: extends: file: compose_zabbix_components.yaml - service: zabbix-java-gateway + service: java-gateway build: context: ./Dockerfiles/java-gateway/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -163,7 +163,7 @@ services: zabbix-snmptraps: extends: file: compose_zabbix_components.yaml - service: zabbix-snmptraps + service: snmptraps build: context: ./Dockerfiles/snmptraps/${UBUNTU_OS_TAG_SHORT} cache_from: @@ -177,7 +177,7 @@ services: zabbix-web-service: extends: file: compose_zabbix_components.yaml - service: zabbix-web-service + service: web-service build: context: ./Dockerfiles/web-service/${UBUNTU_OS_TAG_SHORT} cache_from: