Fixed Alpine compilation and images tagging

This commit is contained in:
Alexey Pustovalov 2024-01-20 23:25:35 +09:00
parent e0e4687ce5
commit 4e1056ec49
6 changed files with 5 additions and 41 deletions

10
.env
View File

@ -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

View File

@ -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 \

View File

@ -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 \

View File

@ -38,7 +38,6 @@ RUN set -eux && \
INSTALL_PKGS="bash \
tini \
fping \
traceroute \
nmap \
tzdata \
iputils \

View File

@ -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 \

View File

@ -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"