extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-02-05 04:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

All images updated to latest stable base images Alpine 3.12, Ubuntu 20 (focal), CentOS 8

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-08-06 16:19:22 -04:00
parent 5bcb06e8c7
commit 45e2969dc7
38 changed files with 216 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix agent" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

24
agent/centos/Dockerfile
View File

@ -1,4 +1,4 @@
FROM centos:centos7
FROM centos:centos8
LABEL org.opencontainers.image.title="Zabbix agent" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -22,10 +22,9 @@ RUN set -eux && \
mkdir -p /var/lib/zabbix && \
mkdir -p /var/lib/zabbix/enc && \
mkdir -p /var/lib/zabbix/modules && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \
libldap \
libcurl \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs \
libcurl-minimal \
openssl-libs && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
@ -41,9 +40,9 @@ RUN set -eux && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
yum -y clean all && \
dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.2
@ -56,10 +55,11 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
org.opencontainers.image.source="${ZBX_SOURCES}"
RUN set -eux && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs \
autoconf \
automake \
pcre-devel \
libcurl-devel \
make \
openssl-devel \
@ -92,13 +92,13 @@ RUN set -eux && \
cp /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf && \
cd /tmp/ && \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
yum -y clean all && \
dnf -y history undo `dnf -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
dnf -y clean all && \
chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
EXPOSE 10050/TCP

26
agent/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix agent" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -9,8 +9,6 @@ LABEL org.opencontainers.image.title="Zabbix agent" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
RUN set -eux && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
addgroup --system --gid 1995 --quiet zabbix && \
@ -27,29 +25,11 @@ RUN set -eux && \
mkdir -p /var/lib/zabbix/modules && \
apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
curl \
tini \
ca-certificates \
gpg \
dirmngr \
gpg-agent \
libssl1.1 \
libcurl4 \
libldap-2.4 && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
export GNUPGHOME="$(mktemp -d)" && \
for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
ipv4.pool.sks-keyservers.net \
keyserver.ubuntu.com \
keyserver.pgp.com \
pgp.mit.edu) ; do \
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
done && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
apt-get -y purge curl gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
@ -127,7 +107,7 @@ WORKDIR /var/lib/zabbix
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
USER 1997

2
java-gateway/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

20
java-gateway/centos/Dockerfile
View File

@ -1,4 +1,4 @@
FROM centos:centos7
FROM centos:centos8
LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -17,12 +17,12 @@ RUN set -eux && \
zabbix && \
mkdir -p /etc/zabbix/ && \
mkdir -p /usr/sbin/zabbix_java/ && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs \
java-1.8.0-openjdk-headless && \
yum -y clean all && \
dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.2
@ -37,8 +37,8 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
COPY ["conf/etc/", "/etc/"]
RUN set -eux && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs \
autoconf \
automake \
java-1.8.0-openjdk-devel \
@ -66,13 +66,13 @@ RUN set -eux && \
rm -rf /usr/sbin/zabbix_java/lib/*.xml && \
cd /tmp/ && \
rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
yum -y clean all && \
dnf -y history undo `dnf -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
dnf -y clean all && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \
chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
EXPOSE 10052/TCP

2
java-gateway/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

8
proxy-mysql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -36,7 +36,7 @@ RUN set -eux && \
libcurl \
libevent \
libldap \
libssh2 \
libssh \
libxml2 \
mariadb-client \
mariadb-connector-c \
@ -68,7 +68,7 @@ RUN set -eux && \
g++ \
git \
make \
libssh2-dev \
libssh-dev \
libxml2-dev \
mysql-dev \
net-snmp-dev \
@ -97,7 +97,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \

32
proxy-mysql/centos/Dockerfile
View File

@ -1,4 +1,4 @@
FROM centos:centos7
FROM centos:centos8
LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -30,11 +30,12 @@ RUN set -eux && \
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
mkdir -p /usr/lib/zabbix/externalscripts && \
mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
yum --quiet makecache && \
yum -y install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm --setopt=tsflags=nodocs && \
yum -y install --setopt=tsflags=nodocs \
libcurl \
dnf --quiet makecache && \
dnf -y install http://repo.zabbix.com/non-supported/rhel/8/x86_64/fping-3.16-1.el8.x86_64.rpm --setopt=tsflags=nodocs && \
dnf -y install --setopt=tsflags=nodocs \
libcurl-minimal \
libevent \
libssh \
libxml2 \
mariadb \
net-snmp-libs \
@ -57,9 +58,9 @@ RUN set -eux && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
yum -y clean all && \
dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.2
@ -73,14 +74,16 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
org.opencontainers.image.source="${ZBX_SOURCES}"
RUN set -eux && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \
sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs \
autoconf \
automake \
gcc \
pcre-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libssh-devel \
libxml2-devel \
make \
mariadb-devel \
@ -110,7 +113,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -128,10 +131,11 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
yum -y clean all && \
dnf -y history undo `dnf -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
dnf -y clean all && \
sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
EXPOSE 10051/TCP

41
proxy-mysql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -9,8 +9,6 @@ LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
RUN set -eux && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
addgroup --system --gid 1995 --quiet zabbix && \
@ -35,39 +33,21 @@ RUN set -eux && \
mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
curl \
tini \
ca-certificates \
gpg \
dirmngr \
gpg-agent \
fping \
libcurl4 \
libevent-2.1 \
libmysqlclient20 \
libmysqlclient21 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libssh2-1 \
libsnmp35 \
libssh-4 \
libssl1.1 \
libxml2 \
mysql-client \
snmp-mibs-downloader \
unixodbc && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
export GNUPGHOME="$(mktemp -d)" && \
for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
ipv4.pool.sks-keyservers.net \
keyserver.ubuntu.com \
keyserver.pgp.com \
pgp.mit.edu) ; do \
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
done && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
apt-get -y purge curl gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
@ -97,7 +77,7 @@ RUN set -eux && \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
@ -124,7 +104,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -154,15 +134,14 @@ RUN set -eux && \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
git \
unixodbc-dev && \
apt-get -y autoremove && \
rm -rf /var/lib/apt/lists/* && \
chmod +x /sbin/tini
rm -rf /var/lib/apt/lists/*
EXPOSE 10051/TCP
@ -172,7 +151,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
USER 1997

8
proxy-sqlite3/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -36,7 +36,7 @@ RUN set -eux && \
libcurl \
libevent \
libldap \
libssh2 \
libssh \
libxml2 \
net-snmp-agent-libs \
openipmi-libs \
@ -64,7 +64,7 @@ RUN set -eux && \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libssh-dev \
libxml2-dev \
net-snmp-dev \
openipmi-dev \
@ -96,7 +96,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \

32
proxy-sqlite3/centos/Dockerfile
View File

@ -1,4 +1,4 @@
FROM centos:centos7
FROM centos:centos8
LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -30,11 +30,12 @@ RUN set -eux && \
mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
mkdir -p /usr/lib/zabbix/externalscripts && \
mkdir -p /usr/share/doc/zabbix-proxy-sqlite3 && \
yum --quiet makecache && \
yum -y install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm --setopt=tsflags=nodocs && \
yum -y install --setopt=tsflags=nodocs \
libcurl \
dnf --quiet makecache && \
dnf -y install http://repo.zabbix.com/non-supported/rhel/8/x86_64/fping-3.16-1.el8.x86_64.rpm --setopt=tsflags=nodocs && \
dnf -y install --setopt=tsflags=nodocs \
libcurl-minimal \
libevent \
libssh \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \
@ -56,9 +57,9 @@ RUN set -eux && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
yum -y clean all && \
dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.2
@ -72,14 +73,16 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
org.opencontainers.image.source="${ZBX_SOURCES}"
RUN set -eux && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \
sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs \
autoconf \
automake \
gcc \
pcre-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libssh-devel \
libxml2-devel \
make \
net-snmp-devel \
@ -109,7 +112,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -127,10 +130,11 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
yum -y clean all && \
dnf -y history undo `dnf -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
dnf -y clean all && \
sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
EXPOSE 10051/TCP

39
proxy-sqlite3/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -9,8 +9,6 @@ LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
RUN set -eux && \
echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
addgroup --system --gid 1995 --quiet zabbix && \
@ -34,38 +32,20 @@ RUN set -eux && \
mkdir -p /usr/lib/zabbix/externalscripts && \
apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
curl \
tini \
ca-certificates \
gpg \
dirmngr \
gpg-agent \
fping \
libcurl4 \
libevent-2.1 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libsnmp35 \
libsqlite3-0 \
libssh2-1 \
libssh-4 \
libssl1.1 \
libxml2 \
snmp-mibs-downloader \
unixodbc && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
export GNUPGHOME="$(mktemp -d)" && \
for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
ipv4.pool.sks-keyservers.net \
keyserver.ubuntu.com \
keyserver.pgp.com \
pgp.mit.edu) ; do \
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
done && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
apt-get -y purge curl gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
@ -95,7 +75,7 @@ RUN set -eux && \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
@ -122,7 +102,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -149,15 +129,14 @@ RUN set -eux && \
libpcre3-dev \
libsnmp-dev \
libsqlite3-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
git \
unixodbc-dev && \
apt-get -y autoremove && \
rm -rf /var/lib/apt/lists/* && \
chmod +x /sbin/tini
rm -rf /var/lib/apt/lists/*
EXPOSE 10051/TCP
@ -167,7 +146,7 @@ VOLUME ["/var/lib/zabbix/snmptraps"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
USER 1997

8
server-mysql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -40,7 +40,7 @@ RUN set -eux && \
libcurl \
libevent \
libldap \
libssh2 \
libssh-4 \
libxml2 \
mariadb-client \
mariadb-connector-c \
@ -68,7 +68,7 @@ RUN set -eux && \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libssh-dev \
libxml2-dev \
mysql-dev \
net-snmp-dev \
@ -100,7 +100,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \

32
server-mysql/centos/Dockerfile
View File

@ -1,4 +1,4 @@
FROM centos:centos7
FROM centos:centos8
LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -32,14 +32,15 @@ RUN set -eux && \
mkdir -p /usr/lib/zabbix/alertscripts && \
mkdir -p /usr/lib/zabbix/externalscripts && \
mkdir -p /usr/share/doc/zabbix-server-mysql && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum -y install --setopt=tsflags=nodocs \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs http://repo.zabbix.com/non-supported/rhel/8/x86_64/fping-3.16-1.el8.x86_64.rpm && \
dnf -y install --setopt=tsflags=nodocs \
iputils \
traceroute \
libcurl \
libcurl-minimal \
libevent \
libxml2 \
libssh \
mariadb \
net-snmp-libs \
OpenIPMI-libs \
@ -61,9 +62,9 @@ RUN set -eux && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
yum -y clean all && \
dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.2
@ -77,14 +78,16 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
org.opencontainers.image.source="${ZBX_SOURCES}"
RUN set -eux && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs \
sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs \
autoconf \
automake \
gcc \
pcre-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libssh-devel \
libxml2-devel \
make \
mariadb-devel \
@ -114,7 +117,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -134,10 +137,11 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
yum -y clean all && \
dnf -y history undo `dnf -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
dnf -y clean all && \
sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
EXPOSE 10051/TCP

38
server-mysql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -9,8 +9,6 @@ LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
RUN set -eux && \
addgroup --system --gid 1995 --quiet zabbix && \
adduser --quiet \
@ -37,41 +35,23 @@ RUN set -eux && \
mkdir -p /usr/share/doc/zabbix-server-mysql && \
apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
curl \
tini \
ca-certificates \
gpg \
dirmngr \
gpg-agent \
iputils-ping \
traceroute \
fping \
libcurl4 \
libevent-2.1 \
libmysqlclient20 \
libmysqlclient21 \
libopenipmi0 \
libpcre3 \
libsnmp30 \
libssh2-1 \
libsnmp35 \
libssh-4 \
libssl1.1 \
libxml2 \
mysql-client \
snmp-mibs-downloader \
unixodbc && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
export GNUPGHOME="$(mktemp -d)" && \
for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
ipv4.pool.sks-keyservers.net \
keyserver.ubuntu.com \
keyserver.pgp.com \
pgp.mit.edu) ; do \
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
done && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
apt-get -y purge curl gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
@ -101,7 +81,7 @@ RUN set -eux && \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
@ -128,7 +108,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -160,7 +140,7 @@ RUN set -eux && \
libopenipmi-dev \
libpcre3-dev \
libsnmp-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
@ -177,7 +157,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
USER 1997

8
server-pgsql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -40,7 +40,7 @@ RUN set -eux && \
libcurl \
libevent \
libldap \
libssh2 \
libssh \
libxml2 \
net-snmp-agent-libs \
openipmi-libs \
@ -69,7 +69,7 @@ RUN set -eux && \
coreutils \
curl-dev \
libevent-dev \
libssh2-dev \
libssh-dev \
libxml2-dev \
net-snmp-dev \
openipmi-dev \
@ -101,7 +101,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \

32
server-pgsql/centos/Dockerfile
View File

@ -1,4 +1,4 @@
FROM centos:centos7
FROM centos:centos8
LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -32,13 +32,14 @@ RUN set -eux && \
mkdir -p /usr/lib/zabbix/alertscripts && \
mkdir -p /usr/lib/zabbix/externalscripts && \
mkdir -p /usr/share/doc/zabbix-server-postgresql && \
yum --quiet makecache && \
yum -y install --setopt=tsflags=nodocs https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
yum -y install --setopt=tsflags=nodocs \
dnf --quiet makecache && \
dnf -y install --setopt=tsflags=nodocs https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
dnf -y install --setopt=tsflags=nodocs \
iputils \
traceroute \
libcurl \
libcurl-minimal \
libevent \
libssh \
libxml2 \
net-snmp-libs \
OpenIPMI-libs \
@ -62,9 +63,9 @@ RUN set -eux && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
yum -y clean all && \
dnf -y clean all && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.2
@ -78,14 +79,16 @@ LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentati
org.opencontainers.image.source="${ZBX_SOURCES}"
RUN set -eux && \
yum --quiet makecache && \
yum -y install \
sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
dnf --quiet makecache && \
dnf -y install \
autoconf \
automake \
gcc \
pcre-devel \
libcurl-devel \
libevent-devel \
libssh2-devel \
libssh-devel \
libxml2-devel \
make \
net-snmp-devel \
@ -115,7 +118,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -136,10 +139,11 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
yum -y clean all && \
dnf -y history undo `dnf -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
dnf -y clean all && \
sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/CentOS-PowerTools.repo && \
rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
rm -rf /etc/udev/hwdb.bin /root/.pki
rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
EXPOSE 10051/TCP

39
server-pgsql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -9,8 +9,6 @@ LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
STOPSIGNAL SIGTERM
ENV TINI_VERSION=v0.19.0
RUN set -eux && \
addgroup --system --gid 1995 --quiet zabbix && \
adduser --quiet \
@ -37,11 +35,8 @@ RUN set -eux && \
mkdir -p /usr/share/doc/zabbix-server-postgresql && \
apt-get -y update && \
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
curl \
tini \
ca-certificates \
gpg \
dirmngr \
gpg-agent \
iputils-ping \
traceroute \
fping \
@ -50,28 +45,13 @@ RUN set -eux && \
libopenipmi0 \
libpcre3 \
libpq5 \
libsnmp30 \
libssh2-1 \
libsnmp35 \
libssh-4 \
libssl1.1 \
libxml2 \
postgresql-client \
snmp-mibs-downloader \
unixodbc && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
export GNUPGHOME="$(mktemp -d)" && \
for server in $(shuf -e ha.pool.sks-keyservers.net \
hkp://p80.pool.sks-keyservers.net:80 \
ipv4.pool.sks-keyservers.net \
keyserver.ubuntu.com \
keyserver.pgp.com \
pgp.mit.edu) ; do \
gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \
done && \
gpg --batch --verify /tmp/tini.asc /sbin/tini && \
rm -r "$GNUPGHOME" /tmp/tini.asc && \
chmod +x /sbin/tini && \
apt-get -y purge curl gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
apt-get -y clean && \
rm -rf /var/lib/apt/lists/*
@ -101,7 +81,7 @@ RUN set -eux && \
libpcre3-dev \
libpq-dev \
libsnmp-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
@ -128,7 +108,7 @@ RUN set -eux && \
--with-net-snmp \
--with-openipmi \
--with-openssl \
--with-ssh2 \
--with-ssh \
--with-unixodbc \
--enable-ipv6 \
--silent && \
@ -161,15 +141,14 @@ RUN set -eux && \
libpcre3-dev \
libpq-dev \
libsnmp-dev \
libssh2-1-dev \
libssh-dev \
libxml2-dev \
make \
pkg-config \
git \
unixodbc-dev && \
apt-get -y autoremove && \
rm -rf /var/lib/apt/lists/* && \
chmod +x /sbin/tini
rm -rf /var/lib/apt/lists/*
EXPOSE 10051/TCP
@ -179,7 +158,7 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/export"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
USER 1997

2
snmptraps/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
ARG MAJOR_VERSION=5.0
ARG ZBX_VERSION=${MAJOR_VERSION}.2

2
web-apache-mysql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

22
web-apache-mysql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -28,13 +28,13 @@ RUN set -eux && \
ca-certificates \
mysql-client \
locales \
php7.2-bcmath \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-mysql \
php7.2-xml && \
php7.4-bcmath \
php7.4-gd \
php7.4-json \
php7.4-ldap \
php7.4-mbstring \
php7.4-mysql \
php7.4-xml && \
rm -f /etc/apache2/sites-available/* && \
rm -f /etc/apache2/sites-enabled/* && \
/usr/sbin/a2enmod ssl && \
@ -93,9 +93,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.2/ && \
chgrp -R 0 /etc/apache2/ /etc/php/7.2/ && \
chmod -R g=u /etc/apache2/ /etc/php/7.2/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.4/ && \
chgrp -R 0 /etc/apache2/ /etc/php/7.4/ && \
chmod -R g=u /etc/apache2/ /etc/php/7.4/ && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge \
gettext \
git && \

0
web-apache-mysql/ubuntu/conf/etc/php/7.2/apache2/conf.d/99-zabbix.ini → web-apache-mysql/ubuntu/conf/etc/php/7.4/apache2/conf.d/99-zabbix.ini
View File

2
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -208,7 +208,7 @@ prepare_zbx_web_config() {
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
PHP_CONFIG_FILE="/etc/php/7.4/apache2/conf.d/99-zabbix.ini"
update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}"

2
web-apache-pgsql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

22
web-apache-pgsql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -27,13 +27,13 @@ RUN set -eux && \
libapache2-mod-php \
ca-certificates \
locales \
php7.2-bcmath \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-xml \
php7.2-pgsql \
php7.4-bcmath \
php7.4-gd \
php7.4-json \
php7.4-ldap \
php7.4-mbstring \
php7.4-xml \
php7.4-pgsql \
postgresql-client && \
rm -f /etc/apache2/sites-available/* && \
rm -f /etc/apache2/sites-enabled/* && \
@ -93,9 +93,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.2/ && \
chgrp -R 0 /etc/apache2/ /etc/php/7.2/ && \
chmod -R g=u /etc/apache2/ /etc/php/7.2/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.4/ && \
chgrp -R 0 /etc/apache2/ /etc/php/7.4/ && \
chmod -R g=u /etc/apache2/ /etc/php/7.4/ && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge \
gettext \
git && \

2
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -228,7 +228,7 @@ prepare_zbx_web_config() {
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
PHP_CONFIG_FILE="/etc/php/7.4/apache2/conf.d/99-zabbix.ini"
update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}"

2
web-nginx-mysql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

26
web-nginx-mysql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -46,18 +46,18 @@ RUN set -eux && \
mysql-client \
nginx \
locales \
php7.2-bcmath \
php7.2-fpm \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-mysql \
php7.2-xml \
php7.4-bcmath \
php7.4-fpm \
php7.4-gd \
php7.4-json \
php7.4-ldap \
php7.4-mbstring \
php7.4-mysql \
php7.4-xml \
supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/nginx/ && \
rm -f /etc/php/7.2/fpm/pool.d/www.conf && \
rm -f /etc/php/7.4/fpm/pool.d/www.conf && \
ln -sf /dev/fd/2 /var/log/nginx/error.log && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
@ -103,9 +103,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chgrp -R 0 /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chmod -R g=u /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chgrp -R 0 /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chmod -R g=u /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \

2
web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf → web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
View File

@ -1,4 +1,4 @@
include=/etc/php/7.2/fpm/pool.d/*.conf
include=/etc/php/7.4/fpm/pool.d/*.conf
[global]

0
web-nginx-mysql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf → web-nginx-mysql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
View File

4
web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0
[program:php-fpm7.2]
command = /usr/sbin/%(program_name)s -F -y /etc/php/7.2/fpm/php-fpm.conf
[program:php-fpm7.4]
command = /usr/sbin/%(program_name)s -F -y /etc/php/7.4/fpm/php-fpm.conf
auto_start = true
autorestart = true

2
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -228,7 +228,7 @@ prepare_zbx_web_config() {
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
PHP_CONFIG_FILE="/etc/php/7.2/fpm/pool.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php/7.4/fpm/pool.d/zabbix.conf"
update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"
update_config_var "$PHP_CONFIG_FILE" "php_value[memory_limit]" "${ZBX_MEMORYLIMIT:-"128M"}"

2
web-nginx-pgsql/alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12
LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \

26
web-nginx-pgsql/ubuntu/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal
LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \
org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
@ -45,19 +45,19 @@ RUN set -eux && \
curl \
nginx \
locales \
php7.2-bcmath \
php7.2-fpm \
php7.2-gd \
php7.2-json \
php7.2-ldap \
php7.2-mbstring \
php7.2-xml \
php7.2-pgsql \
php7.4-bcmath \
php7.4-fpm \
php7.4-gd \
php7.4-json \
php7.4-ldap \
php7.4-mbstring \
php7.4-xml \
php7.4-pgsql \
postgresql-client \
supervisor && \
rm -f /etc/nginx/conf.d/*.conf && \
rm -rf /var/cache/nginx/ && \
rm -f /etc/php/7.2/fpm/pool.d/www.conf && \
rm -f /etc/php/7.4/fpm/pool.d/www.conf && \
ln -sf /dev/fd/2 /var/log/nginx/error.log && \
DEBIAN_FRONTEND=noninteractive apt-get -y purge curl gpg dirmngr gpg-agent && \
apt-get -y autoremove && \
@ -103,9 +103,9 @@ RUN set -eux && \
chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chgrp -R 0 /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chmod -R g=u /etc/nginx/ /etc/php/7.2/fpm/php-fpm.conf /etc/php/7.2/fpm/pool.d/ && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chgrp -R 0 /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chmod -R g=u /etc/nginx/ /etc/php/7.4/fpm/php-fpm.conf /etc/php/7.4/fpm/pool.d/ && \
chown --quiet -R zabbix:root /var/lib/php/session/ && \
chgrp -R 0 /var/lib/php/session/ && \
chmod -R g=u /var/lib/php/session/ && \

2
web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/php-fpm.conf → web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/php-fpm.conf
View File

@ -1,4 +1,4 @@
include=/etc/php/7.2/fpm/pool.d/*.conf
include=/etc/php/7.4/fpm/pool.d/*.conf
[global]

0
web-nginx-pgsql/ubuntu/conf/etc/php/7.2/fpm/pool.d/zabbix.conf → web-nginx-pgsql/ubuntu/conf/etc/php/7.4/fpm/pool.d/zabbix.conf
View File

4
web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0
[program:php-fpm7.2]
command = /usr/sbin/%(program_name)s -F -y /etc/php/7.2/fpm/php-fpm.conf
[program:php-fpm7.4]
command = /usr/sbin/%(program_name)s -F -y /etc/php/7.4/fpm/php-fpm.conf
auto_start = true
autorestart = true

2
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -242,7 +242,7 @@ prepare_zbx_web_config() {
ZBX_WWW_ROOT="/usr/share/zabbix"
ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
PHP_CONFIG_FILE="/etc/php/7.2/fpm/pool.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php/7.4/fpm/pool.d/zabbix.conf"
update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"
update_config_var "$PHP_CONFIG_FILE" "php_value[memory_limit]" "${ZBX_MEMORYLIMIT:-"128M"}"