mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-04-10 18:48:30 +02:00
Fixed Alpine compilation and images tagging
This commit is contained in:
parent
e0e4687ce5
commit
4e1056ec49
10
.env
10
.env
@ -1,9 +1,9 @@
|
|||||||
# Zabbix images
|
# Zabbix images
|
||||||
ZABBIX_ALPINE_IMAGE_TAG=alpine
|
ZABBIX_ALPINE_IMAGE_TAG=alpine-5.0
|
||||||
ZABBIX_CENTOS_IMAGE_TAG=centos
|
ZABBIX_CENTOS_IMAGE_TAG=centos-5.0
|
||||||
ZABBIX_OL_IMAGE_TAG=ol
|
ZABBIX_OL_IMAGE_TAG=ol-5.0
|
||||||
ZABBIX_UBUNTU_IMAGE_TAG=ubuntu
|
ZABBIX_UBUNTU_IMAGE_TAG=ubuntu-5.0
|
||||||
ZABBIX_IMAGE_TAG_POSTFIX=-5.0-latest
|
ZABBIX_IMAGE_TAG_POSTFIX=-latest
|
||||||
ZABBIX_LOCAL_IMAGE_TAG_POSTFIX=-local
|
ZABBIX_LOCAL_IMAGE_TAG_POSTFIX=-local
|
||||||
|
|
||||||
ZABBIX_SERVER_MYSQL_IMAGE=zabbix/zabbix-server-mysql
|
ZABBIX_SERVER_MYSQL_IMAGE=zabbix/zabbix-server-mysql
|
||||||
|
@ -37,7 +37,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql
|
|||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
traceroute \
|
|
||||||
nmap \
|
nmap \
|
||||||
iputils \
|
iputils \
|
||||||
libcap \
|
libcap \
|
||||||
|
@ -36,7 +36,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/conf/zabbix_proxy.conf", "/etc/
|
|||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
traceroute \
|
|
||||||
nmap \
|
nmap \
|
||||||
fping \
|
fping \
|
||||||
iputils \
|
iputils \
|
||||||
|
@ -38,7 +38,6 @@ RUN set -eux && \
|
|||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
fping \
|
fping \
|
||||||
traceroute \
|
|
||||||
nmap \
|
nmap \
|
||||||
tzdata \
|
tzdata \
|
||||||
iputils \
|
iputils \
|
||||||
|
@ -38,7 +38,6 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb
|
|||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
INSTALL_PKGS="bash \
|
INSTALL_PKGS="bash \
|
||||||
tini \
|
tini \
|
||||||
traceroute \
|
|
||||||
nmap \
|
nmap \
|
||||||
fping \
|
fping \
|
||||||
tzdata \
|
tzdata \
|
||||||
|
@ -477,35 +477,3 @@ services:
|
|||||||
com.zabbix.description: "Zabbix snmptraps"
|
com.zabbix.description: "Zabbix snmptraps"
|
||||||
com.zabbix.company: "Zabbix LLC"
|
com.zabbix.company: "Zabbix LLC"
|
||||||
com.zabbix.component: "snmptraps"
|
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"
|
|
||||||
|
Loading…
Reference in New Issue
Block a user