diff --git a/.env b/.env index 75e8e1341..c0870c4e7 100644 --- a/.env +++ b/.env @@ -1,9 +1,9 @@ # Zabbix images -ZABBIX_ALPINE_IMAGE_TAG=alpine -ZABBIX_CENTOS_IMAGE_TAG=centos -ZABBIX_OL_IMAGE_TAG=ol -ZABBIX_UBUNTU_IMAGE_TAG=ubuntu -ZABBIX_IMAGE_TAG_POSTFIX=-5.0-latest +ZABBIX_ALPINE_IMAGE_TAG=alpine-5.0 +ZABBIX_CENTOS_IMAGE_TAG=centos-5.0 +ZABBIX_OL_IMAGE_TAG=ol-5.0 +ZABBIX_UBUNTU_IMAGE_TAG=ubuntu-5.0 +ZABBIX_IMAGE_TAG_POSTFIX=-latest ZABBIX_LOCAL_IMAGE_TAG_POSTFIX=-local ZABBIX_SERVER_MYSQL_IMAGE=zabbix/zabbix-server-mysql diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index 6a24ad77d..fade72689 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -37,7 +37,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql RUN set -eux && \ INSTALL_PKGS="bash \ tini \ - traceroute \ nmap \ iputils \ libcap \ diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 056d3b4f1..2ea6017f2 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -36,7 +36,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/ RUN set -eux && \ INSTALL_PKGS="bash \ tini \ - traceroute \ nmap \ fping \ iputils \ diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 143210055..2dbf16a0e 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -38,7 +38,6 @@ RUN set -eux && \ INSTALL_PKGS="bash \ tini \ fping \ - traceroute \ nmap \ tzdata \ iputils \ diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index c53ddf588..f5c4ab3ea 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -38,7 +38,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb RUN set -eux && \ INSTALL_PKGS="bash \ tini \ - traceroute \ nmap \ fping \ tzdata \ diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index 0a06f2cfc..8dad5ba48 100644 --- a/compose_zabbix_components.yaml +++ b/compose_zabbix_components.yaml @@ -477,35 +477,3 @@ services: com.zabbix.description: "Zabbix snmptraps" com.zabbix.company: "Zabbix LLC" com.zabbix.component: "snmptraps" - - zabbix-web-service: - profiles: - - full - - all - ports: - - "${ZABBIX_WEB_SERVICE_PORT}:10053" - restart: "${RESTART_POLICY}" - volumes: - - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro - tmpfs: /tmp - security_opt: - - seccomp:${ENV_VARS_DIRECTORY}/chrome_dp.json - deploy: - resources: - limits: - cpus: '0.5' - memory: 512M - reservations: - cpus: '0.25' - memory: 256M - env_file: - - ${ENV_VARS_DIRECTORY}/.env_web_service - networks: - zbx_net_backend: - aliases: - - zabbix-web-service - stop_grace_period: 5s - labels: - com.zabbix.description: "Zabbix web service" - com.zabbix.company: "Zabbix LLC" - com.zabbix.component: "web-service"