Fixed circular reference error

boylast5577 · Feb 6, 2024 · da6314b · da6314b
1 parent 56e2f10
commit da6314b
Show file tree

Hide file tree

Showing 17 changed files with 168 additions and 168 deletions.
diff --git 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
@@ -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,23 +71,23 @@ 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}"
 
  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}"
 
  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
@@ -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: