mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-08-17 20:11:00 +02:00
Fixed issue with init (PID 1)
This commit is contained in:
@@ -6,7 +6,6 @@ services:
|
|||||||
- "10051:10051"
|
- "10051:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
@@ -67,7 +66,6 @@ services:
|
|||||||
- "10061:10051"
|
- "10061:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -118,7 +116,6 @@ services:
|
|||||||
- "10071:10051"
|
- "10071:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -175,7 +172,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -226,7 +222,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -273,7 +268,6 @@ services:
|
|||||||
- "10050:10050"
|
- "10050:10050"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
|
@@ -10,7 +10,6 @@ services:
|
|||||||
- "10051:10051"
|
- "10051:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
@@ -75,7 +74,6 @@ services:
|
|||||||
- "10061:10051"
|
- "10061:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -130,7 +128,6 @@ services:
|
|||||||
- "10071:10051"
|
- "10071:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -191,7 +188,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -246,7 +242,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -297,7 +292,6 @@ services:
|
|||||||
- "10050:10050"
|
- "10050:10050"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
|
@@ -6,7 +6,6 @@ services:
|
|||||||
- "10051:10051"
|
- "10051:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
@@ -67,7 +66,6 @@ services:
|
|||||||
- "10061:10051"
|
- "10061:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -118,7 +116,6 @@ services:
|
|||||||
- "10071:10051"
|
- "10071:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -175,7 +172,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -226,7 +222,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -273,7 +268,6 @@ services:
|
|||||||
- "10050:10050"
|
- "10050:10050"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
|
@@ -7,7 +7,6 @@ services:
|
|||||||
- "10051:10051"
|
- "10051:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
- ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
@@ -69,7 +68,6 @@ services:
|
|||||||
- "10061:10051"
|
- "10061:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -121,7 +119,6 @@ services:
|
|||||||
- "10071:10051"
|
- "10071:10051"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
- ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
@@ -180,7 +177,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
- ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -232,7 +228,6 @@ services:
|
|||||||
- zabbix-server:zabbix-server
|
- zabbix-server:zabbix-server
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
- ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
@@ -280,7 +275,6 @@ services:
|
|||||||
- "10050:10050"
|
- "10050:10050"
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
- ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
|
||||||
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
- ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
|
||||||
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
- ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
|
||||||
|
@@ -63,8 +63,7 @@ RUN locale-gen $LC_ALL && \
|
|||||||
unixodbc && \
|
unixodbc && \
|
||||||
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
apt-get ${APT_FLAGS_COMMON} autoremove && \
|
||||||
apt-get ${APT_FLAGS_COMMON} clean && \
|
apt-get ${APT_FLAGS_COMMON} clean && \
|
||||||
rm -rf /var/lib/apt/lists/* && \
|
rm -rf /var/lib/apt/lists/*
|
||||||
chmod +x /sbin/tini
|
|
||||||
|
|
||||||
ARG MAJOR_VERSION=3.2
|
ARG MAJOR_VERSION=3.2
|
||||||
ARG ZBX_VERSION=${MAJOR_VERSION}.11
|
ARG ZBX_VERSION=${MAJOR_VERSION}.11
|
||||||
@@ -76,6 +75,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
|
|||||||
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
||||||
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
|
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
|
||||||
|
|
||||||
|
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
|
||||||
|
|
||||||
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
autoconf \
|
autoconf \
|
||||||
|
@@ -72,6 +72,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
|
|||||||
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
||||||
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link zabbix-server:zabbix-server -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
|
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link zabbix-server:zabbix-server -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
|
||||||
|
|
||||||
|
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
|
||||||
|
|
||||||
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
autoconf \
|
autoconf \
|
||||||
|
@@ -77,6 +77,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
|
|||||||
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
||||||
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
|
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"
|
||||||
|
|
||||||
|
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
|
||||||
|
|
||||||
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
autoconf \
|
autoconf \
|
||||||
|
@@ -77,6 +77,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
|
|||||||
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
org.label-schema.vcs-url="${ZBX_SOURCES}" \
|
||||||
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-pgsql --link postgres-server:postgres -p 10051:10051 -d zabbix-${ZBX_TYPE}-pgsql:ubuntu-${ZBX_VERSION}"
|
org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-pgsql --link postgres-server:postgres -p 10051:10051 -d zabbix-${ZBX_TYPE}-pgsql:ubuntu-${ZBX_VERSION}"
|
||||||
|
|
||||||
|
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
|
||||||
|
|
||||||
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
RUN apt-get ${APT_FLAGS_COMMON} update && \
|
||||||
apt-get ${APT_FLAGS_DEV} install \
|
apt-get ${APT_FLAGS_DEV} install \
|
||||||
autoconf \
|
autoconf \
|
||||||
|
@@ -122,6 +122,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin/ /usr/sbin/za
|
|||||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/ /usr/sbin/zabbix_java/lib/
|
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/ /usr/sbin/zabbix_java/lib/
|
||||||
|
|
||||||
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/frontends/php/ /usr/share/zabbix/
|
COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/frontends/php/ /usr/share/zabbix/
|
||||||
|
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
|
||||||
|
|
||||||
RUN locale-gen $LC_ALL && \
|
RUN locale-gen $LC_ALL && \
|
||||||
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
|
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
|
||||||
|
Reference in New Issue
Block a user