From 4541352fbb93531d283493b9355d46e934223943 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 28 May 2024 17:10:23 +0900 Subject: [PATCH] Updated compose file. No more version. Added name. Removed prefixes for networks. --- compose_additional_components.yaml | 8 +- compose_databases.yaml | 16 +++- compose_zabbix_components.yaml | 86 +++++++++++++++------- docker-compose_v3_alpine_mysql_latest.yaml | 11 +-- docker-compose_v3_alpine_mysql_local.yaml | 14 ++-- docker-compose_v3_alpine_pgsql_latest.yaml | 11 +-- docker-compose_v3_alpine_pgsql_local.yaml | 15 ++-- docker-compose_v3_centos_mysql_latest.yaml | 11 +-- docker-compose_v3_centos_mysql_local.yaml | 14 ++-- docker-compose_v3_centos_pgsql_latest.yaml | 11 +-- docker-compose_v3_centos_pgsql_local.yaml | 15 ++-- docker-compose_v3_ol_mysql_latest.yaml | 11 +-- docker-compose_v3_ol_mysql_local.yaml | 14 ++-- docker-compose_v3_ol_pgsql_latest.yaml | 11 +-- docker-compose_v3_ol_pgsql_local.yaml | 15 ++-- docker-compose_v3_ubuntu_mysql_latest.yaml | 11 +-- docker-compose_v3_ubuntu_mysql_local.yaml | 14 ++-- docker-compose_v3_ubuntu_pgsql_latest.yaml | 11 +-- docker-compose_v3_ubuntu_pgsql_local.yaml | 15 ++-- env_vars/.env_prx | 7 -- env_vars/.env_prx_mysql | 7 ++ 21 files changed, 207 insertions(+), 121 deletions(-) diff --git a/compose_additional_components.yaml b/compose_additional_components.yaml index fbbc4b7620..21cbf3af05 100644 --- a/compose_additional_components.yaml +++ b/compose_additional_components.yaml @@ -1,14 +1,18 @@ -version: '3.8' services: selenium: image: "${WEBDRIVER_IMAGE}:${WEBDRIVER_IMAGE_TAG}" restart: "${RESTART_POLICY}" + attach: false + scale: 4 profiles: - full - all shm_size: "2gb" + env_file: + - path: ${ENV_VARS_DIRECTORY}/.env_selenium + required: false networks: - zbx_tools_frontend: + tools_frontend: aliases: - webdriver - selenium diff --git a/compose_databases.yaml b/compose_databases.yaml index 50f5368dd5..797b00eb79 100644 --- a/compose_databases.yaml +++ b/compose_databases.yaml @@ -1,9 +1,9 @@ -version: '3.8' services: mysql-server: image: "${MYSQL_IMAGE}:${MYSQL_IMAGE_TAG}" command: - mysqld + - --skip-mysqlx - --character-set-server=utf8mb4 - --collation-server=utf8mb4_bin # Only during upgrade from versions prior 6.4 and new installations (schema deployment) @@ -14,12 +14,15 @@ services: # - --ssl-cert=/run/secrets/server-cert.pem # - --ssl-key=/run/secrets/server-key.pem restart: "${RESTART_POLICY}" + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/mysql:/var/lib/mysql:rw - ${ENV_VARS_DIRECTORY}/mysql_init/init_proxy_db.sql:/docker-entrypoint-initdb.d/mysql_init_proxy.sql:ro # - dbsocket:/var/run/mysqld/ env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql + - path: ${ENV_VARS_DIRECTORY}/.env_db_mysql_override + required: false environment: - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/MYSQL_ROOT_PASSWORD secrets: @@ -31,7 +34,7 @@ services: # - root-ca.pem stop_grace_period: 1m networks: - zbx_net_database: + database: aliases: - mysql-server @@ -39,6 +42,7 @@ services: image: "${POSTGRESQL_IMAGE}:${POSTGRESQL_IMAGE_TAG}" # command: -c ssl=on -c ssl_cert_file=/run/secrets/server-cert.pem -c ssl_key_file=/run/secrets/server-key.pem -c ssl_ca_file=/run/secrets/root-ca.pem restart: "${RESTART_POLICY}" + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/postgresql/data:/var/lib/postgresql/data:rw - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro @@ -46,12 +50,14 @@ services: - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro env_file: - ${ENV_VARS_DIRECTORY}/.env_db_pgsql + - path: ${ENV_VARS_DIRECTORY}/.env_db_pgsql_override + required: false secrets: - POSTGRES_USER - POSTGRES_PASSWORD stop_grace_period: 1m networks: - zbx_net_database: + database: aliases: - postgres-server @@ -62,12 +68,14 @@ services: db-data-pgsql: image: busybox + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/postgresql/data:/var/lib/postgresql/data:rw elasticsearch: image: "${ELASTICSEARCH_IMAGE}:${ELASTICSEARCH_IMAGE_TAG}" restart: "${RESTART_POLICY}" + attach: false profiles: - full - all @@ -75,6 +83,6 @@ services: - transport.host=0.0.0.0 - discovery.zen.minimum_master_nodes=1 networks: - zbx_net_database: + database: aliases: - elasticsearch diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index 83af488bc7..9f20c8ddae 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -1,10 +1,10 @@ -version: '3.8' services: server: init: true ports: - "${ZABBIX_SERVER_PORT}:10051" restart: "${RESTART_POLICY}" + attach: true volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro @@ -32,15 +32,17 @@ services: memory: 512M env_file: - ${ENV_VARS_DIRECTORY}/.env_srv + - path: ${ENV_VARS_DIRECTORY}/.env_srv_override + required: false networks: - zbx_net_database: + database: aliases: - zabbix-server - zbx_net_backend: + backend: aliases: - zabbix-server - zbx_net_frontend: - zbx_tools_frontend: + frontend: + tools_frontend: # devices: # - "/dev/ttyUSB0:/dev/ttyUSB0" stop_grace_period: 30s @@ -70,7 +72,7 @@ services: # - client-cert.pem # - root-ca.pem networks: - zbx_net_backend: + backend: aliases: - zabbix-server-mysql labels: @@ -90,7 +92,7 @@ services: - POSTGRES_USER - POSTGRES_PASSWORD networks: - zbx_net_backend: + backend: aliases: - zabbix-server-pgsql labels: @@ -102,6 +104,7 @@ services: profiles: - all restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro @@ -127,9 +130,9 @@ services: env_file: - ${ENV_VARS_DIRECTORY}/.env_prx networks: - zbx_net_backend: - zbx_net_frontend: - zbx_tools_frontend: + backend: + frontend: + tools_frontend: stop_grace_period: 30s # cap_add: # - "NET_RAW" @@ -150,8 +153,10 @@ services: - "${ZABBIX_PROXY_SQLITE3_PORT}:10051" env_file: - ${ENV_VARS_DIRECTORY}/.env_prx_sqlite3 + - path: ${ENV_VARS_DIRECTORY}/.env_prx_sqlite3_override + required: false networks: - zbx_net_backend: + backend: aliases: - zabbix-proxy-sqlite3 labels: @@ -168,6 +173,8 @@ services: env_file: - ${ENV_VARS_DIRECTORY}/.env_db_mysql_proxy - ${ENV_VARS_DIRECTORY}/.env_prx_mysql + - path: ${ENV_VARS_DIRECTORY}/.env_prx_mysql_override + required: false secrets: - MYSQL_USER - MYSQL_PASSWORD @@ -175,10 +182,10 @@ services: # - client-cert.pem # - root-ca.pem networks: - zbx_net_database: + database: aliases: - zabbix-proxy-mysql - zbx_net_backend: + backend: aliases: - zabbix-proxy-mysql labels: @@ -192,6 +199,7 @@ services: - "${ZABBIX_WEB_APACHE_HTTP_PORT}:8080" - "${ZABBIX_WEB_APACHE_HTTPS_PORT}:8443" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/ssl/apache2:/etc/ssl/apache2:ro @@ -207,6 +215,8 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_web + - path: ${ENV_VARS_DIRECTORY}/.env_web_override + required: false healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/"] interval: 10s @@ -214,9 +224,9 @@ services: retries: 3 start_period: 30s networks: - zbx_net_database: - zbx_net_backend: - zbx_net_frontend: + database: + backend: + frontend: stop_grace_period: 10s sysctls: - net.core.somaxconn=65535 @@ -255,7 +265,7 @@ services: - POSTGRES_USER - POSTGRES_PASSWORD networks: - zbx_net_backend: + backend: aliases: - zabbix-web-apache-pgsql labels: @@ -267,6 +277,7 @@ services: - "${ZABBIX_WEB_NGINX_HTTP_PORT}:8080" - "${ZABBIX_WEB_NGINX_HTTPS_PORT}:8443" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/ssl/nginx:/etc/ssl/nginx:ro @@ -282,6 +293,8 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_web + - path: ${ENV_VARS_DIRECTORY}/.env_web_override + required: false healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/ping"] interval: 10s @@ -289,9 +302,9 @@ services: retries: 3 start_period: 30s networks: - zbx_net_database: - zbx_net_backend: - zbx_net_frontend: + database: + backend: + frontend: stop_grace_period: 10s sysctls: - net.core.somaxconn=65535 @@ -314,7 +327,7 @@ services: # - client-cert.pem # - root-ca.pem networks: - zbx_net_backend: + backend: aliases: - zabbix-web-nginx-mysql labels: @@ -334,7 +347,7 @@ services: - POSTGRES_USER - POSTGRES_PASSWORD networks: - zbx_net_backend: + backend: aliases: - zabbix-web-nginx-pgsql labels: @@ -349,6 +362,7 @@ services: ports: - "${ZABBIX_AGENT_PORT}:10050" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro @@ -367,10 +381,12 @@ services: mode: global env_file: - ${ENV_VARS_DIRECTORY}/.env_agent + - path: ${ENV_VARS_DIRECTORY}/.env_agent_override + required: false privileged: true pid: "host" networks: - zbx_net_backend: + backend: aliases: - zabbix-agent - zabbix-agent-passive @@ -388,6 +404,7 @@ services: ports: - "${ZABBIX_AGENT2_PORT}:10050" restart: "${RESTART_POLICY}" + attach: false volumes: - /etc/localtime:/etc/localtime:ro - ${DATA_DIRECTORY}/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro @@ -406,10 +423,12 @@ services: mode: global env_file: - ${ENV_VARS_DIRECTORY}/.env_agent + - path: ${ENV_VARS_DIRECTORY}/.env_agent_override + required: false privileged: true pid: "host" networks: - zbx_net_backend: + backend: aliases: - zabbix-agent - zabbix-agent-passive @@ -426,6 +445,7 @@ services: ports: - "${ZABBIX_JAVA_GATEWAY_PORT}:10052" restart: "${RESTART_POLICY}" + attach: false deploy: resources: limits: @@ -436,10 +456,13 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_java + - path: ${ENV_VARS_DIRECTORY}/.env_java_override + required: false networks: - zbx_net_backend: + backend: aliases: - zabbix-java-gateway + frontend: stop_grace_period: 5s labels: com.zabbix.description: "Zabbix Java Gateway" @@ -456,6 +479,8 @@ services: ports: - "${ZABBIX_SNMPTRAPS_PORT}:1162/udp" restart: "${RESTART_POLICY}" + attach: false + read_only: true volumes: - snmptraps:/var/lib/zabbix/snmptraps:rw tmpfs: /tmp @@ -469,11 +494,13 @@ services: memory: 128M env_file: - ${ENV_VARS_DIRECTORY}/.env_snmptraps + - path: ${ENV_VARS_DIRECTORY}/.env_snmptraps_override + required: false networks: - zbx_net_frontend: + frontend: aliases: - zabbix-snmptraps - zbx_net_backend: + backend: stop_grace_period: 5s labels: com.zabbix.description: "Zabbix snmptraps" @@ -487,6 +514,7 @@ services: ports: - "${ZABBIX_WEB_SERVICE_PORT}:10053" restart: "${RESTART_POLICY}" + attach: false volumes: - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro tmpfs: /tmp @@ -502,8 +530,10 @@ services: memory: 256M env_file: - ${ENV_VARS_DIRECTORY}/.env_web_service + - path: ${ENV_VARS_DIRECTORY}/.env_web_service_override + required: false networks: - zbx_net_backend: + backend: aliases: - zabbix-web-service stop_grace_period: 5s diff --git a/docker-compose_v3_alpine_mysql_latest.yaml b/docker-compose_v3_alpine_mysql_latest.yaml index decb59fb59..d482e98622 100644 --- a/docker-compose_v3_alpine_mysql_latest.yaml +++ b/docker-compose_v3_alpine_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -113,7 +114,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -121,7 +122,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -130,14 +131,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_alpine_mysql_local.yaml b/docker-compose_v3_alpine_mysql_local.yaml index 5a114f3bef..31e4c0749a 100644 --- a/docker-compose_v3_alpine_mysql_local.yaml +++ b/docker-compose_v3_alpine_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${ALPINE_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -210,7 +214,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -218,7 +222,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -227,14 +231,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_alpine_pgsql_latest.yaml b/docker-compose_v3_alpine_pgsql_latest.yaml index f7d090797b..63e6a416ef 100644 --- a/docker-compose_v3_alpine_pgsql_latest.yaml +++ b/docker-compose_v3_alpine_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -123,7 +124,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -131,7 +132,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -140,14 +141,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_alpine_pgsql_local.yaml b/docker-compose_v3_alpine_pgsql_local.yaml index 00b2b73986..969ee1c439 100644 --- a/docker-compose_v3_alpine_pgsql_local.yaml +++ b/docker-compose_v3_alpine_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${ALPINE_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_ALPINE_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -233,7 +238,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -241,7 +246,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -250,14 +255,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_mysql_latest.yaml b/docker-compose_v3_centos_mysql_latest.yaml index 5bc8ab4f9a..5e0aee097e 100644 --- a/docker-compose_v3_centos_mysql_latest.yaml +++ b/docker-compose_v3_centos_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -113,7 +114,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -121,7 +122,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -130,14 +131,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_mysql_local.yaml b/docker-compose_v3_centos_mysql_local.yaml index ab0d6e497f..7b4990f64c 100644 --- a/docker-compose_v3_centos_mysql_local.yaml +++ b/docker-compose_v3_centos_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${CENTOS_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -211,7 +215,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -219,7 +223,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -228,14 +232,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_pgsql_latest.yaml b/docker-compose_v3_centos_pgsql_latest.yaml index be133666ee..01857e78fa 100644 --- a/docker-compose_v3_centos_pgsql_latest.yaml +++ b/docker-compose_v3_centos_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -123,7 +124,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -131,7 +132,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -140,14 +141,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 1629932507..cf609acd3b 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${CENTOS_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -233,7 +238,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -241,7 +246,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -250,14 +255,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_mysql_latest.yaml b/docker-compose_v3_ol_mysql_latest.yaml index 4b1f87ebd9..a138a8eb9c 100644 --- a/docker-compose_v3_ol_mysql_latest.yaml +++ b/docker-compose_v3_ol_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -113,7 +114,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -121,7 +122,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -130,14 +131,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_mysql_local.yaml b/docker-compose_v3_ol_mysql_local.yaml index 45772b60a4..3aac7c884f 100644 --- a/docker-compose_v3_ol_mysql_local.yaml +++ b/docker-compose_v3_ol_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${OL_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -211,7 +215,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -219,7 +223,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -228,14 +232,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_pgsql_latest.yaml b/docker-compose_v3_ol_pgsql_latest.yaml index c79f958adc..e6a0d9fc78 100644 --- a/docker-compose_v3_ol_pgsql_latest.yaml +++ b/docker-compose_v3_ol_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -123,7 +124,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -131,7 +132,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -140,14 +141,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ol_pgsql_local.yaml b/docker-compose_v3_ol_pgsql_local.yaml index 30b87f6c0f..f0d462da0c 100644 --- a/docker-compose_v3_ol_pgsql_local.yaml +++ b/docker-compose_v3_ol_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${OL_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_OL_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -233,7 +238,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -241,7 +246,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -250,14 +255,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_mysql_latest.yaml b/docker-compose_v3_ubuntu_mysql_latest.yaml index c599b1e21b..1dc8a2aea3 100644 --- a/docker-compose_v3_ubuntu_mysql_latest.yaml +++ b/docker-compose_v3_ubuntu_mysql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -101,7 +102,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -109,7 +110,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -118,14 +119,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_mysql_local.yaml b/docker-compose_v3_ubuntu_mysql_local.yaml index 556b3f582b..50c5227833 100644 --- a/docker-compose_v3_ubuntu_mysql_local.yaml +++ b/docker-compose_v3_ubuntu_mysql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-mysql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -199,7 +203,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -207,7 +211,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -216,14 +220,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_pgsql_latest.yaml b/docker-compose_v3_ubuntu_pgsql_latest.yaml index 158b94ae0d..1df655e415 100644 --- a/docker-compose_v3_ubuntu_pgsql_latest.yaml +++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-server: extends: @@ -111,7 +112,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -119,7 +120,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -128,14 +129,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/docker-compose_v3_ubuntu_pgsql_local.yaml b/docker-compose_v3_ubuntu_pgsql_local.yaml index 214d13b9a4..f17877b48d 100644 --- a/docker-compose_v3_ubuntu_pgsql_local.yaml +++ b/docker-compose_v3_ubuntu_pgsql_local.yaml @@ -1,4 +1,5 @@ -version: '3.8' +name: zbx${ZABBIX_IMAGE_TAG_POSTFIX} + services: zabbix-build-base: build: @@ -6,6 +7,7 @@ services: cache_from: - "${UBUNTU_CACHE_FROM}" image: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false zabbix-build-pgsql: build: @@ -15,6 +17,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_PGSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false depends_on: - zabbix-build-base @@ -26,6 +29,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_MYSQL_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -39,6 +43,7 @@ services: args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} image: ${BUILD_BASE_SQLITE3_IMAGE}:${ZABBIX_UBUNTU_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX} + attach: false profiles: - all depends_on: @@ -221,7 +226,7 @@ services: # service: selenium networks: - zbx_net_frontend: + frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${FRONTEND_ENABLE_IPV6}" @@ -229,7 +234,7 @@ networks: driver: "${FRONTEND_NETWORK_DRIVER}" config: - subnet: "${FRONTEND_SUBNET}" - zbx_net_backend: + backend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${BACKEND_ENABLE_IPV6}" @@ -238,14 +243,14 @@ networks: driver: "${BACKEND_NETWORK_DRIVER}" config: - subnet: "${BACKEND_SUBNET}" - zbx_net_database: + database: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${DATABASE_NETWORK_ENABLE_IPV6}" internal: true ipam: driver: "${DATABASE_NETWORK_DRIVER}" - zbx_tools_frontend: + tools_frontend: driver: bridge driver_opts: com.docker.network.enable_ipv6: "${ADD_TOOLS_ENABLE_IPV6}" diff --git a/env_vars/.env_prx b/env_vars/.env_prx index ca35666ada..360e109f91 100644 --- a/env_vars/.env_prx +++ b/env_vars/.env_prx @@ -7,14 +7,7 @@ # ZBX_LOGREMOTECOMMANDS=0 # Available since 3.4.0 # ZBX_HOSTNAMEITEM=system.hostname # ZBX_SOURCEIP= -# ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0 # ZBX_MAXCONCURRENTCHECKSPERPOLLER=1000 # Available since 7.0.0 -# ZBX_DBTLSCONNECT=require # Available since 5.0.0 -# ZBX_DBTLSCAFILE=/run/secrets/root-ca.pem # Available since 5.0.0 -# ZBX_DBTLSCERTFILE=/run/secrets/client-cert.pem # Available since 5.0.0 -# ZBX_DBTLSKEYFILE=/run/secrets/client-key.pem # Available since 5.0.0 -# ZBX_DBTLSCIPHER= # Available since 5.0.0 -# ZBX_DBTLSCIPHER13= # Available since 5.0.0 # ZBX_DEBUGLEVEL=3 # ZBX_PROXYBUFFERMODE=disk # Available since 7.0.0 # ZBX_PROXYMEMORYBUFFERAGE=0 # Available since 7.0.0 diff --git a/env_vars/.env_prx_mysql b/env_vars/.env_prx_mysql index 8b351c57d6..c7a9333c1d 100644 --- a/env_vars/.env_prx_mysql +++ b/env_vars/.env_prx_mysql @@ -1 +1,8 @@ # ZBX_HOSTNAME=zabbix-proxy-mysql +# ZBX_DBTLSCONNECT=require # Available since 5.0.0 +# ZBX_DBTLSCAFILE=/run/secrets/root-ca.pem # Available since 5.0.0 +# ZBX_DBTLSCERTFILE=/run/secrets/client-cert.pem # Available since 5.0.0 +# ZBX_DBTLSKEYFILE=/run/secrets/client-key.pem # Available since 5.0.0 +# ZBX_DBTLSCIPHER= # Available since 5.0.0 +# ZBX_DBTLSCIPHER13= # Available since 5.0.0 +# ZBX_ALLOWUNSUPPORTEDDBVERSIONS=0 # Available since 6.0.0