Updated CentOS images

agent/alpine/Dockerfile

@@ -77,7 +77,6 @@ RUN set -eux && \
     cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
     cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
     cp /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf && \
-    chown -R zabbix:zabbix /etc/zabbix/ && \
     cd /tmp/ && \
     rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
     chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \

agent/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour
 
 # Zabbix agent images
 
-These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are:
+These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are:
 
     Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

agent/centos/Dockerfile

@@ -1,17 +1,55 @@
-FROM centos:centos7 as builder
+FROM centos:centos7
 
-ARG YUM_FLAGS_COMMON="-y"
+LABEL org.opencontainers.image.title="Zabbix agent" \
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+STOPSIGNAL SIGTERM
+
+ENV TINI_VERSION=v0.19.0
+
+RUN set -eux && \
+    groupadd -g 1995 --system zabbix && \
+    adduser -r --shell /sbin/nologin \
+            -g zabbix -G root \
+            -d /var/lib/zabbix/ -u 1997 \
+        zabbix && \
+    mkdir -p /etc/zabbix && \
+    mkdir -p /etc/zabbix/zabbix_agentd.d && \
+    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 \
+            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 /tini.asc && \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
+    gpg --batch --verify /tini.asc /sbin/tini && \
+    rm -rf /root/.gnupg && \
+    chmod +x /sbin/tini && \
+    yum -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
 
 ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+
-    ZBX_TYPE=agent
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
 
 RUN set -eux && \
     yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
+    yum -y install --setopt=tsflags=nodocs \
             autoconf \
             automake \
             libcurl-devel \
@@ -39,65 +77,20 @@ RUN set -eux && \
             --with-openssl \
             --enable-ipv6 \
             --silent && \
-    make -j"$(nproc)" -s
+    make -j"$(nproc)" -s && \
-
+    cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd && \
-FROM centos:centos7
+    cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+    cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-
+    cp /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf && \
-ARG BUILD_DATE
+    cd /tmp/ && \
-ARG VCS_REF
+    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
-ARG YUM_FLAGS_COMMON="-y"
+    yum -y clean all && \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
-
+    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
-ARG MAJOR_VERSION=5.0
+    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-ARG ZBX_VERSION=${MAJOR_VERSION}
+    rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+    rm -rf /etc/udev/hwdb.bin /root/.pki
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
-ENV TINI_VERSION v0.18.0
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix agent is deployed on a monitoring target to actively monitor local resources and applications" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE} --link zabbix-server:zabbix-server -p 10050:10050 -d zabbix-${ZBX_TYPE}:centos-${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
-COPY --from=builder  /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
-
-RUN set -eux && \
-    groupadd --system zabbix && \
-    adduser -r --shell /sbin/nologin \
-            -g zabbix \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    mkdir -p /etc/zabbix && \
-    mkdir -p /etc/zabbix/zabbix_agentd.d && \
-    mkdir -p /var/lib/zabbix && \
-    mkdir -p /var/lib/zabbix/enc && \
-    mkdir -p /var/lib/zabbix/modules && \
-    chown --quiet -R zabbix:root /var/lib/zabbix && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTENT} install \
-            libldap \
-            libcurl \
-            openssl-libs && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum && \
-    chmod +x /sbin/tini
 
 EXPOSE 10050/TCP
 
@@ -108,3 +101,7 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
+
+USER 1997
+
+CMD ["/usr/sbin/zabbix_agentd", "--foreground", "-c", "/etc/zabbix/zabbix_agentd.conf"]

agent/centos/README.md

@@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour
 
 # Zabbix agent images
 
-These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are:
+These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are:
 
     Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

agent/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour
 
 # Zabbix agent images
 
-These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are:
+These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix agent are:
 
     Zabbix agent 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix agent 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

docker-compose_v3_alpine_mysql_local.yaml

@@ -4,7 +4,7 @@ services:
   build: 
    context: ./server-mysql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-server-mysql:alpine-local
   ports:
    - "10051:10051"
@@ -73,7 +73,7 @@ services:
   build:
    context: ./proxy-sqlite3/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-proxy-sqlite3:alpine-local
   ports:
    - "10061:10051"
@@ -127,7 +127,7 @@ services:
   build:
    context: ./proxy-mysql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-proxy-mysql:alpine-local
   ports:
    - "10071:10051"
@@ -183,7 +183,7 @@ services:
   build:
    context: ./web-apache-mysql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-web-apache-mysql:alpine-local
   ports:
    - "80:8080"
@@ -240,7 +240,7 @@ services:
   build:
    context: ./web-nginx-mysql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-web-nginx-mysql:alpine-local
   ports:
    - "8081:8080"
@@ -297,7 +297,7 @@ services:
   build:
    context: ./agent/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-agent:alpine-local
   ports:
    - "10050:10050"
@@ -340,7 +340,7 @@ services:
   build:
    context: ./java-gateway/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-java-gateway:alpine-local
   ports:
    - "10052:10052"
@@ -370,7 +370,7 @@ services:
   build:
    context: ./snmptraps/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-snmptraps:alpine-local
   ports:
    - "162:1162/udp"

docker-compose_v3_alpine_pgsql_local.yaml

@@ -4,7 +4,7 @@ services:
   build:
    context: ./server-pgsql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-server-pgsql:alpine-local
   ports:
    - "10051:10051"
@@ -72,7 +72,7 @@ services:
   build:
    context: ./proxy-sqlite3/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-proxy-sqlite3:alpine-local
   ports:
    - "10061:10051"
@@ -126,7 +126,7 @@ services:
   build:
    context: ./proxy-mysql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-proxy-mysql:alpine-local
   ports:
    - "10071:10051"
@@ -187,7 +187,7 @@ services:
   build:
    context: ./web-apache-pgsql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-web-apache-pgsql:alpine-local
   ports:
    - "80:8080"
@@ -244,7 +244,7 @@ services:
   build:
    context: ./web-nginx-pgsql/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-web-nginx-pgsql:alpine-local
   ports:
    - "8081:8080"
@@ -301,7 +301,7 @@ services:
   build:
    context: ./agent/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-agent:alpine-local
   ports:
    - "10050:10050"
@@ -344,7 +344,7 @@ services:
   build:
    context: ./java-gateway/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-java-gateway:alpine-local
   ports:
    - "10052:10052"
@@ -374,7 +374,7 @@ services:
   build:
    context: ./snmptraps/alpine
    cache_from:
-    - alpine:3.10
+    - alpine:3.11
   image: zabbix-snmptraps:alpine-local
   ports:
    - "162:1162/udp"

docker-compose_v3_centos_mysql_latest.yaml

@@ -38,7 +38,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-java-gateway
@@ -98,7 +97,6 @@ services:
   env_file:
    - .env_prx
    - .env_prx_sqlite3
-  user: root
   depends_on:
    - zabbix-java-gateway
    - zabbix-snmptraps
@@ -150,7 +148,6 @@ services:
    - .env_db_mysql_proxy
    - .env_prx
    - .env_prx_mysql
-  user: root
   depends_on:
    - mysql-server
    - zabbix-java-gateway
@@ -173,8 +170,8 @@ services:
  zabbix-web-apache-mysql:
   image: zabbix/zabbix-web-apache-mysql:centos-trunk
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -196,12 +193,11 @@ services:
   secrets:
    - MYSQL_USER
    - MYSQL_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -227,8 +223,8 @@ services:
  zabbix-web-nginx-mysql:
   image: zabbix/zabbix-web-nginx-mysql:centos-trunk
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -250,12 +246,11 @@ services:
   secrets:
    - MYSQL_USER
    - MYSQL_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -302,7 +297,6 @@ services:
    mode: global
   env_file:
    - .env_agent
-  user: root
   privileged: true
   pid: "host"
   networks:
@@ -332,7 +326,6 @@ services:
       memory: 256M
   env_file:
    - .env_java
-  user: root
   networks:
    zbx_net_backend:
     aliases:
@@ -348,7 +341,7 @@ services:
  zabbix-snmptraps:
   image: zabbix/zabbix-snmptraps:centos-trunk
   ports:
-   - "162:162/udp"
+   - "162:1162/udp"
   volumes:
    - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw
   deploy:
@@ -359,7 +352,6 @@ services:
     reservations:
       cpus: '0.25'
       memory: 128M
-  user: root
   networks:
    zbx_net_frontend:
     aliases:
@@ -383,7 +375,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   stop_grace_period: 1m
   networks:
    zbx_net_backend:

docker-compose_v3_centos_mysql_local.yaml

@@ -42,7 +42,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-java-gateway
@@ -106,7 +105,6 @@ services:
   env_file:
    - .env_prx
    - .env_prx_sqlite3
-  user: root
   depends_on:
    - zabbix-java-gateway
    - zabbix-snmptraps
@@ -162,7 +160,6 @@ services:
    - .env_db_mysql_proxy
    - .env_prx
    - .env_prx_mysql
-  user: root
   depends_on:
    - mysql-server
    - zabbix-java-gateway
@@ -189,8 +186,8 @@ services:
     - centos:centos7
   image: zabbix-web-apache-mysql:centos-local
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -212,12 +209,11 @@ services:
   secrets:
    - MYSQL_USER
    - MYSQL_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -247,8 +243,8 @@ services:
     - centos:centos7
   image: zabbix-web-nginx-mysql:centos-local
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -270,12 +266,11 @@ services:
   secrets:
    - MYSQL_USER
    - MYSQL_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -326,7 +321,6 @@ services:
    mode: global
   env_file:
    - .env_agent
-  user: root
   privileged: true
   pid: "host"
   networks:
@@ -360,7 +354,6 @@ services:
       memory: 256M
   env_file:
    - .env_java
-  user: root
   networks:
    zbx_net_backend:
     aliases:
@@ -380,7 +373,7 @@ services:
     - centos:centos7
   image: zabbix-snmptraps:centos-local
   ports:
-   - "162:162/udp"
+   - "162:1162/udp"
   volumes:
    - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw
   deploy:
@@ -391,7 +384,6 @@ services:
     reservations:
       cpus: '0.25'
       memory: 128M
-  user: root
   networks:
    zbx_net_frontend:
     aliases:
@@ -415,7 +407,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   stop_grace_period: 1m
   networks:
    zbx_net_backend:

docker-compose_v3_centos_pgsql_latest.yaml

@@ -37,7 +37,6 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   depends_on:
    - postgres-server
    - zabbix-java-gateway
@@ -97,7 +96,6 @@ services:
   env_file:
    - .env_prx
    - .env_prx_sqlite3
-  user: root
   depends_on:
    - zabbix-java-gateway
    - zabbix-snmptraps
@@ -153,7 +151,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-java-gateway
@@ -176,8 +173,8 @@ services:
  zabbix-web-apache-pgsql:
   image: zabbix/zabbix-web-apache-pgsql:centos-trunk
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -199,12 +196,11 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   depends_on:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -230,8 +226,8 @@ services:
  zabbix-web-nginx-pgsql:
   image: zabbix/zabbix-web-nginx-pgsql:centos-trunk
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -253,12 +249,11 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   depends_on:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -305,7 +300,6 @@ services:
    mode: global
   env_file:
    - .env_agent
-  user: root
   privileged: true
   pid: "host"
   networks:
@@ -335,7 +329,6 @@ services:
       memory: 256M
   env_file:
    - .env_java
-  user: root
   networks:
    zbx_net_backend:
     aliases:
@@ -351,7 +344,7 @@ services:
  zabbix-snmptraps:
   image: zabbix/zabbix-snmptraps:centos-trunk
   ports:
-   - "162:162/udp"
+   - "162:1162/udp"
   volumes:
    - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw
   deploy:
@@ -362,7 +355,6 @@ services:
     reservations:
       cpus: '0.25'
       memory: 128M
-  user: root
   networks:
    zbx_net_frontend:
     aliases:
@@ -386,7 +378,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   stop_grace_period: 1m
   networks:
    zbx_net_backend:
@@ -404,7 +395,6 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   stop_grace_period: 1m
   networks:
    zbx_net_backend:

docker-compose_v3_centos_pgsql_local.yaml

@@ -38,7 +38,6 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   depends_on:
    - postgres-server
    - zabbix-java-gateway
@@ -99,7 +98,6 @@ services:
   env_file:
    - .env_prx
    - .env_prx_sqlite3
-  user: root
   depends_on:
    - zabbix-java-gateway
    - zabbix-snmptraps
@@ -156,7 +154,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   depends_on:
    - mysql-server
    - zabbix-java-gateway
@@ -181,8 +178,8 @@ services:
   build: ./web-apache-pgsql/centos
   image: zabbix-web-apache-pgsql:centos-local
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -204,12 +201,11 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   depends_on:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -236,8 +232,8 @@ services:
   build: ./web-nginx-pgsql/centos
   image: zabbix-web-nginx-pgsql:centos-local
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -259,12 +255,11 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   depends_on:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -312,7 +307,6 @@ services:
    mode: global
   env_file:
    - .env_agent
-  user: root
   privileged: true
   pid: "host"
   networks:
@@ -343,7 +337,6 @@ services:
       memory: 256M
   env_file:
    - .env_java
-  user: root
   networks:
    zbx_net_backend:
     aliases:
@@ -363,7 +356,7 @@ services:
     - centos:centos7
   image: zabbix-snmptraps:centos-local
   ports:
-   - "162:162/udp"
+   - "162:1162/udp"
   volumes:
    - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:rw
   deploy:
@@ -374,7 +367,6 @@ services:
     reservations:
       cpus: '0.25'
       memory: 128M
-  user: root
   networks:
    zbx_net_frontend:
     aliases:
@@ -398,7 +390,6 @@ services:
    - MYSQL_USER
    - MYSQL_PASSWORD
    - MYSQL_ROOT_PASSWORD
-  user: root
   stop_grace_period: 1m
   networks:
    zbx_net_backend:
@@ -416,7 +407,6 @@ services:
   secrets:
    - POSTGRES_USER
    - POSTGRES_PASSWORD
-  user: root
   stop_grace_period: 1m
   networks:
    zbx_net_backend:

java-gateway/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav
 
 # Zabbix Java Gateway images
 
-These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
+These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
 
     Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

java-gateway/centos/Dockerfile

@@ -1,17 +1,42 @@
-FROM centos:centos7 as builder
+FROM centos:centos7
 
-ARG YUM_FLAGS_COMMON="-y"
+LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+STOPSIGNAL SIGTERM
+
+RUN set -eux && \
+    groupadd -g 1995 --system zabbix && \
+    adduser -r --shell /sbin/nologin \
+            -g zabbix -G root \
+            -d /var/lib/zabbix/ -u 1997 \
+        zabbix && \
+    mkdir -p /etc/zabbix/ && \
+    mkdir -p /usr/sbin/zabbix_java/ && \
+    yum --quiet makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+            java-1.8.0-openjdk-headless && \
+    yum -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
 
 ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+
-    ZBX_TYPE=java-gateway
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
 
 RUN set -eux && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
+    yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
+    yum -y install --setopt=tsflags=nodocs \
             autoconf \
             automake \
             java-1.8.0-openjdk-devel \
@@ -33,55 +58,19 @@ RUN set -eux && \
             --enable-java \
             --silent && \
     make -j"$(nproc)" -s && \
-    rm -rf src/zabbix_java/lib/*.xml
-
-FROM centos:centos7
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
-
-ARG BUILD_DATE
-ARG VCS_REF
-
-ARG YUM_FLAGS_COMMON="-y"
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
-
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=java-gateway ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix Java Gateway performs native support for monitoring JMX applications" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE} --link zabbix-server:zabbix-server -p 10052:10052 -d zabbix-${ZBX_TYPE}:centos-${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin/* /usr/sbin/zabbix_java/bin/
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/* /usr/sbin/zabbix_java/lib/
-
-RUN set -eux && \
-    groupadd --system zabbix && \
-    adduser --system --shell /sbin/nologin \
-            -g zabbix \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    mkdir -p /etc/zabbix/ && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
     mkdir -p /usr/sbin/zabbix_java/ && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
+    cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \
-    yum ${YUM_FLAGS_PERSISTENT} install \
+    cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \
-            java-1.8.0-openjdk-headless && \
+    rm -rf /usr/sbin/zabbix_java/lib/*.xml && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
+    cd /tmp/ && \
-    rm -rf /var/cache/yum/
+    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 && \
+    chown --quiet -R zabbix:root /etc/zabbix/ && \
+    chgrp -R 0 /etc/zabbix/ && \
+    chmod -R g=u /etc/zabbix/ && \
+    rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
+    rm -rf /etc/udev/hwdb.bin /root/.pki
 
 EXPOSE 10052/TCP
 
@@ -94,3 +83,7 @@ COPY ["conf/usr/sbin/zabbix_java_gateway", "/usr/sbin/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["docker-entrypoint.sh"]
+
+USER 1997
+
+CMD ["/usr/sbin/zabbix_java_gateway"]

java-gateway/centos/README.md

@@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav
 
 # Zabbix Java Gateway images
 
-These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
+These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
 
     Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

java-gateway/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav
 
 # Zabbix Java Gateway images
 
-These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
+These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix Java Gateway are:
 
     Zabbix Java Gateway 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix Java Gateway 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

kubernetes.yaml

@@ -15,10 +15,10 @@ metadata:
 spec:
   ports:
   - port: 80
-    targetPort: 80
+    targetPort: 8080
     name: web-http
   - port: 443
-    targetPort: 443
+    targetPort: 8443
     name: web-https
   selector:
     name: zabbix-web
@@ -54,7 +54,7 @@ spec:
     targetPort: 10051
     name: zabbix-trapper
   - port: 162
-    targetPort: 162
+    targetPort: 1162
     protocol: UDP
     name: snmp-trap
   selector:
@@ -75,7 +75,7 @@ spec:
     targetPort: 10051
     name: zabbix-trapper
   - port: 162
-    targetPort: 162
+    targetPort: 1162
     protocol: UDP
     name: snmp-trap
   selector:
@@ -94,7 +94,7 @@ spec:
     targetPort: 10051
     name: zabbix-trapper
   - port: 162
-    targetPort: 162
+    targetPort: 1162
     protocol: UDP
     name: snmp-trap
   selector:
@@ -151,9 +151,9 @@ spec:
           image: zabbix/zabbix-web-nginx-mysql:alpine-3.4-latest
           imagePullPolicy: Always
           ports:
-          - containerPort: 80
+          - containerPort: 8080
             name: web-http
-          - containerPort: 443
+          - containerPort: 8443
             name: web-https
           resources:
            limits:
@@ -334,7 +334,7 @@ spec:
           image: zabbix/zabbix-snmptraps:ubuntu-3.4-latest
           imagePullPolicy: Always
           ports:
-          - containerPort: 162
+          - containerPort: 1162
             protocol: UDP
             name: snmp-trap
           volumeMounts:

proxy-mysql/alpine/Dockerfile

@@ -19,7 +19,6 @@ RUN set -eux && \
     mkdir -p /etc/zabbix && \
     mkdir -p /var/lib/zabbix && \
     mkdir -p /var/lib/zabbix/enc && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /var/lib/zabbix/mibs && \
     mkdir -p /var/lib/zabbix/modules && \
     mkdir -p /var/lib/zabbix/snmptraps && \
@@ -28,6 +27,7 @@ RUN set -eux && \
     mkdir -p /var/lib/zabbix/ssl/certs && \
     mkdir -p /var/lib/zabbix/ssl/keys && \
     mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
+    mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-proxy-mysql && \
     apk add --clean-protected --no-cache \
             tini \

proxy-mysql/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
 
     Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

proxy-mysql/centos/Dockerfile

@@ -1,17 +1,72 @@
-FROM centos:centos7 as builder
+FROM centos:centos7
 
-ARG YUM_FLAGS_COMMON="-y"
+LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix proxy with MySQL database support" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+STOPSIGNAL SIGTERM
+
+ENV TINI_VERSION=v0.19.0
+
+RUN set -eux && \
+    groupadd -g 1995 --system zabbix && \
+    adduser -r --shell /sbin/nologin \
+            -g zabbix -G root \
+            -d /var/lib/zabbix/ -u 1997 \
+        zabbix && \
+    mkdir -p /etc/zabbix && \
+    mkdir -p /var/lib/zabbix && \
+    mkdir -p /var/lib/zabbix/enc && \
+    mkdir -p /var/lib/zabbix/mibs && \
+    mkdir -p /var/lib/zabbix/modules && \
+    mkdir -p /var/lib/zabbix/snmptraps && \
+    mkdir -p /var/lib/zabbix/ssh_keys && \
+    mkdir -p /var/lib/zabbix/ssl && \
+    mkdir -p /var/lib/zabbix/ssl/certs && \
+    mkdir -p /var/lib/zabbix/ssl/keys && \
+    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 \
+            libevent \
+            libxml2 \
+            mariadb \
+            net-snmp-libs \
+            OpenIPMI-libs \
+            openldap \
+            openssl-libs \
+            pcre \
+            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 /tini.asc && \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
+    gpg --batch --verify /tini.asc /sbin/tini && \
+    rm -rf /root/.gnupg && \
+    chmod +x /sbin/tini && \
+    yum -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
 
 ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+
-    ZBX_TYPE=proxy ZBX_DB_TYPE=mysql
+ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
 
 RUN set -eux && \
     yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
+    yum -y install --setopt=tsflags=nodocs \
             autoconf \
             automake \
             gcc \
@@ -39,8 +94,8 @@ RUN set -eux && \
             --sysconfdir=/etc/zabbix \
             --prefix=/usr \
             --enable-agent \
-            --enable-${ZBX_TYPE} \
+            --enable-proxy \
-            --with-${ZBX_DB_TYPE} \
+            --with-mysql \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -53,84 +108,22 @@ RUN set -eux && \
             --silent && \
     make -j"$(nproc)" -s dbschema && \
     make -j"$(nproc)" -s && \
-    cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
-    gzip database/${ZBX_DB_TYPE}/create.sql
+    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-
+    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-FROM centos:centos7
+    cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+    cat database/mysql/schema.sql > database/mysql/create.sql && \
-
+    gzip database/mysql/create.sql && \
-ARG BUILD_DATE
+    cp database/mysql/create.sql.gz /usr/share/doc/zabbix-proxy-mysql/ && \
-ARG VCS_REF
+    cd /tmp/ && \
-
+    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-ARG YUM_FLAGS_COMMON="-y"
+    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
-
+    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-ARG MAJOR_VERSION=5.0
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
-ARG ZBX_VERSION=${MAJOR_VERSION}
+    yum -y clean all && \
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+    rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
-ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
+    rm -rf /etc/udev/hwdb.bin /root/.pki
-    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
-ENV TINI_VERSION v0.18.0
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix ${ZBX_TYPE} with MySQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      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}:centos-${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE}
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
-
-RUN set -eux && \
-    groupadd --system zabbix && \
-    adduser -r --shell /sbin/nologin \
-            -g zabbix \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    mkdir -p /etc/zabbix && \
-    mkdir -p /var/lib/zabbix && \
-    mkdir -p /var/lib/zabbix/enc && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
-    mkdir -p /var/lib/zabbix/mibs && \
-    mkdir -p /var/lib/zabbix/modules && \
-    mkdir -p /var/lib/zabbix/snmptraps && \
-    mkdir -p /var/lib/zabbix/ssh_keys && \
-    mkdir -p /var/lib/zabbix/ssl && \
-    mkdir -p /var/lib/zabbix/ssl/certs && \
-    mkdir -p /var/lib/zabbix/ssl/keys && \
-    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
-    chown --quiet -R zabbix:root /var/lib/zabbix && \
-    mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTENT} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
-    yum ${YUM_FLAGS_PERSISTENT} install \
-            libcurl \
-            libevent \
-            libxml2 \
-            mariadb \
-            net-snmp-libs \
-            OpenIPMI-libs \
-            openldap \
-            openssl-libs \
-            pcre \
-            unixODBC && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/ && \
-    chmod +x /sbin/tini
 
 EXPOSE 10051/TCP
 
@@ -142,3 +135,7 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
+
+USER 1997
+
+CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"]

proxy-mysql/centos/README.md

@@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
 
     Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

proxy-mysql/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
 
     Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

proxy-sqlite3/alpine/Dockerfile

@@ -19,7 +19,6 @@ RUN set -eux && \
     mkdir -p /etc/zabbix && \
     mkdir -p /var/lib/zabbix && \
     mkdir -p /var/lib/zabbix/enc && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /var/lib/zabbix/mibs && \
     mkdir -p /var/lib/zabbix/modules && \
     mkdir -p /var/lib/zabbix/snmptraps && \
@@ -28,6 +27,7 @@ RUN set -eux && \
     mkdir -p /var/lib/zabbix/ssl/certs && \
     mkdir -p /var/lib/zabbix/ssl/keys && \
     mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
+    mkdir -p /usr/lib/zabbix/externalscripts && \
     apk add --clean-protected --no-cache \
             tini \
             bash \

proxy-sqlite3/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
 
     Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

proxy-sqlite3/centos/Dockerfile

@@ -1,17 +1,71 @@
-FROM centos:centos7 as builder
+FROM centos:centos7
 
-ARG YUM_FLAGS_COMMON="-y"
+LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix proxy with SQLite3 database support" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+STOPSIGNAL SIGTERM
+
+ENV TINI_VERSION=v0.19.0
+
+RUN set -eux && \
+    groupadd -g 1995 --system zabbix && \
+    adduser -r --shell /sbin/nologin \
+            -g zabbix -G root \
+            -d /var/lib/zabbix/ -u 1997 \
+        zabbix && \
+    mkdir -p /etc/zabbix && \
+    mkdir -p /var/lib/zabbix && \
+    mkdir -p /var/lib/zabbix/enc && \
+    mkdir -p /var/lib/zabbix/mibs && \
+    mkdir -p /var/lib/zabbix/modules && \
+    mkdir -p /var/lib/zabbix/snmptraps && \
+    mkdir -p /var/lib/zabbix/ssh_keys && \
+    mkdir -p /var/lib/zabbix/ssl && \
+    mkdir -p /var/lib/zabbix/ssl/certs && \
+    mkdir -p /var/lib/zabbix/ssl/keys && \
+    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 \
+            libevent \
+            libxml2 \
+            net-snmp-libs \
+            OpenIPMI-libs \
+            openldap \
+            openssl-libs \
+            pcre \
+            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 /tini.asc && \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
+    gpg --batch --verify /tini.asc /sbin/tini && \
+    rm -rf /root/.gnupg && \
+    chmod +x /sbin/tini && \
+    yum -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
 
 ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+
-    ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3
+ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
 
 RUN set -eux && \
     yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
+    yum -y install --setopt=tsflags=nodocs \
             autoconf \
             automake \
             gcc \
@@ -39,8 +93,8 @@ RUN set -eux && \
             --sysconfdir=/etc/zabbix \
             --prefix=/usr \
             --enable-agent \
-            --enable-${ZBX_TYPE} \
+            --enable-proxy \
-            --with-${ZBX_DB_TYPE} \
+            --with-sqlite3 \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -53,83 +107,22 @@ RUN set -eux && \
             --silent && \
     make -j"$(nproc)" -s dbschema && \
     make -j"$(nproc)" -s  && \
-    cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
-    gzip database/${ZBX_DB_TYPE}/create.sql
+    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-
+    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-FROM centos:centos7
+    cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+    cat database/sqlite3/schema.sql > database/sqlite3/create.sql && \
-
+    gzip database/sqlite3/create.sql && \
-ARG BUILD_DATE
+    cp database/sqlite3/create.sql.gz /usr/share/doc/zabbix-proxy-sqlite3/ && \
-ARG VCS_REF
+    cd /tmp/ && \
-
+    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-ARG YUM_FLAGS_COMMON="-y"
+    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
-
+    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-ARG MAJOR_VERSION=5.0
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
-ARG ZBX_VERSION=${MAJOR_VERSION}
+    yum -y clean all && \
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+    rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
-ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
+    rm -rf /etc/udev/hwdb.bin /root/.pki
-    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none
-ENV TINI_VERSION v0.18.0
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix ${ZBX_TYPE} with SQLite3 database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      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}:centos-${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE}
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
-
-RUN set -eux && \
-    groupadd --system zabbix && \
-    adduser -r --shell /sbin/nologin \
-            -g zabbix \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    mkdir -p /etc/zabbix && \
-    mkdir -p /var/lib/zabbix && \
-    mkdir -p /var/lib/zabbix/enc && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
-    mkdir -p /var/lib/zabbix/mibs && \
-    mkdir -p /var/lib/zabbix/modules && \
-    mkdir -p /var/lib/zabbix/snmptraps && \
-    mkdir -p /var/lib/zabbix/ssh_keys && \
-    mkdir -p /var/lib/zabbix/ssl && \
-    mkdir -p /var/lib/zabbix/ssl/certs && \
-    mkdir -p /var/lib/zabbix/ssl/keys && \
-    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
-    chown --quiet -R zabbix:root /var/lib/zabbix && \
-    mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTENT} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm && \
-    yum ${YUM_FLAGS_PERSISTENT} install \
-            libcurl \
-            libevent \
-            libxml2 \
-            net-snmp-libs \
-            OpenIPMI-libs \
-            openldap \
-            openssl-libs \
-            pcre \
-            unixODBC && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/ && \
-    chmod +x /sbin/tini
 
 EXPOSE 10051/TCP
 
@@ -141,3 +134,7 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
+
+USER 1997
+
+CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"]

proxy-sqlite3/centos/README.md

@@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
 
     Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

proxy-sqlite3/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni
 
 # Zabbix proxy images
 
-These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
+These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix proxy are:
 
     Zabbix proxy 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix proxy 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

server-mysql/alpine/Dockerfile

@@ -12,7 +12,7 @@ STOPSIGNAL SIGTERM
 RUN set -eux && \
     addgroup -S -g 1995 zabbix && \
     adduser -S \
-            -D -G zabbix -G root \
+            -D -G zabbix -G dialout -G root \
             -u 1997 \
             -h /var/lib/zabbix/ \
         zabbix && \
@@ -94,8 +94,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-server \
             --with-mysql \
-# Does not support stable iksemel library
-#            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \

server-mysql/alpine/README.md

@@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
 
     Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

server-mysql/centos/Dockerfile

@@ -1,19 +1,76 @@
-FROM centos:centos7 as builder
+FROM centos:centos7
 
-ARG YUM_FLAGS_COMMON="-y"
+LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix server with MySQL database support" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+STOPSIGNAL SIGTERM
+
+ENV TINI_VERSION=v0.19.0
+
+RUN set -eux && \
+    groupadd -g 1995 --system zabbix && \
+    adduser -r --shell /sbin/nologin \
+            -g zabbix -G dialout -G root \
+            -d /var/lib/zabbix/ -u 1997 \
+        zabbix && \
+    mkdir -p /etc/zabbix && \
+    mkdir -p /var/lib/zabbix && \
+    mkdir -p /var/lib/zabbix/enc && \
+    mkdir -p /var/lib/zabbix/export && \
+    mkdir -p /var/lib/zabbix/mibs && \
+    mkdir -p /var/lib/zabbix/modules && \
+    mkdir -p /var/lib/zabbix/snmptraps && \
+    mkdir -p /var/lib/zabbix/ssh_keys && \
+    mkdir -p /var/lib/zabbix/ssl && \
+    mkdir -p /var/lib/zabbix/ssl/certs && \
+    mkdir -p /var/lib/zabbix/ssl/keys && \
+    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
+    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 \
+            iputils \
+            traceroute \
+            libcurl \
+            libevent \
+            libxml2 \
+            mariadb \
+            net-snmp-libs \
+            OpenIPMI-libs \
+            openldap \
+            openssl-libs \
+            pcre \
+            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 /tini.asc && \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
+    gpg --batch --verify /tini.asc /sbin/tini && \
+    rm -rf /root/.gnupg && \
+    chmod +x /sbin/tini && \
+    yum -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
 
 ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+
-    ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
+ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
 
 RUN set -eux && \
     yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \
+    yum -y install --setopt=tsflags=nodocs \
-                                 https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
-    yum ${YUM_FLAGS_DEV} install \
             autoconf \
             automake \
             gcc \
@@ -41,9 +98,8 @@ RUN set -eux && \
             --prefix=/usr \
             --sysconfdir=/etc/zabbix \
             --enable-agent \
-            --enable-${ZBX_TYPE} \
+            --enable-server \
-            --with-${ZBX_DB_TYPE} \
+            --with-mysql \
-            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -56,91 +112,24 @@ RUN set -eux && \
             --silent && \
     make -j"$(nproc)" -s dbschema && \
     make -j"$(nproc)" -s && \
-    cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
-    cat database/${ZBX_DB_TYPE}/images.sql >> database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cat database/${ZBX_DB_TYPE}/data.sql >> database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    gzip database/${ZBX_DB_TYPE}/create.sql
+    cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
-
+    cat database/mysql/schema.sql > database/mysql/create.sql && \
-FROM centos:centos7
+    cat database/mysql/images.sql >> database/mysql/create.sql && \
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+    cat database/mysql/data.sql >> database/mysql/create.sql && \
-
+    gzip database/mysql/create.sql && \
-ARG BUILD_DATE
+    cp database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/ && \
-ARG VCS_REF
+    cd /tmp/ && \
-
+    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-ARG YUM_FLAGS_COMMON="-y"
+    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
-
+    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-ARG MAJOR_VERSION=5.0
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
-ARG ZBX_VERSION=${MAJOR_VERSION}
+    yum -y clean all && \
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+    rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    rm -rf /etc/udev/hwdb.bin /root/.pki
-    TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
-    ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
-ENV TINI_VERSION v0.18.0
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix ${ZBX_TYPE} with MySQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      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}:centos-${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE}
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
-
-RUN set -eux && \
-    groupadd --system zabbix && \
-    adduser -r --shell /sbin/nologin \
-            -g zabbix -G dialout \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    mkdir -p /etc/zabbix && \
-    mkdir -p /var/lib/zabbix && \
-    mkdir -p /usr/lib/zabbix/alertscripts && \
-    mkdir -p /var/lib/zabbix/enc && \
-    mkdir -p /var/lib/zabbix/export && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
-    mkdir -p /var/lib/zabbix/mibs && \
-    mkdir -p /var/lib/zabbix/modules && \
-    mkdir -p /var/lib/zabbix/snmptraps && \
-    mkdir -p /var/lib/zabbix/ssh_keys && \
-    mkdir -p /var/lib/zabbix/ssl && \
-    mkdir -p /var/lib/zabbix/ssl/certs && \
-    mkdir -p /var/lib/zabbix/ssl/keys && \
-    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
-    chown --quiet -R zabbix:root /var/lib/zabbix && \
-    mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTENT} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
-                                        https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm  && \
-    yum ${YUM_FLAGS_PERSISTENT} install \
-            iputils \
-            traceroute \
-            libcurl \
-            libevent \
-            libxml2 \
-            mariadb \
-            net-snmp-libs \
-            OpenIPMI-libs \
-            openldap \
-            openssl-libs \
-            pcre \
-            unixODBC && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/ && \
-    chmod +x /sbin/tini
 
 EXPOSE 10051/TCP
 
@@ -153,3 +142,7 @@ VOLUME ["/var/lib/zabbix/export"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
+
+USER 1997
+
+CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"]

server-mysql/centos/README.md

@@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
 
     Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

server-mysql/ubuntu/Dockerfile

@@ -58,7 +58,6 @@ RUN set -eux && \
             fping \
             libcurl4 \
             libevent-2.1 \
-            libiksemel3 \
             libmysqlclient20 \
             libopenipmi0 \
             libpcre3 \
@@ -95,7 +94,6 @@ RUN set -eux && \
             libc6-dev \
             libcurl4-openssl-dev \
             libevent-dev \
-            libiksemel-dev \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \
@@ -122,7 +120,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-${ZBX_TYPE} \
             --with-${ZBX_DB_TYPE} \
-            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -154,7 +151,6 @@ RUN set -eux && \
             libc6-dev \
             libcurl4-openssl-dev \
             libevent-dev \
-            libiksemel-dev \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \

server-mysql/ubuntu/README.md

@@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
 
     Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

server-pgsql/alpine/Dockerfile

@@ -12,17 +12,15 @@ STOPSIGNAL SIGTERM
 RUN set -eux && \
     addgroup -S -g 1995 zabbix && \
     adduser -S \
-            -D -G zabbix -G root \
+            -D -G zabbix -G dialout -G root \
             -u 1997 \
             -h /var/lib/zabbix/ \
         zabbix && \
     adduser zabbix dialout && \
     mkdir -p /etc/zabbix && \
     mkdir -p /var/lib/zabbix && \
-    mkdir -p /usr/lib/zabbix/alertscripts && \
     mkdir -p /var/lib/zabbix/enc && \
     mkdir -p /var/lib/zabbix/export && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /var/lib/zabbix/mibs && \
     mkdir -p /var/lib/zabbix/modules && \
     mkdir -p /var/lib/zabbix/snmptraps && \
@@ -31,6 +29,8 @@ RUN set -eux && \
     mkdir -p /var/lib/zabbix/ssl/certs && \
     mkdir -p /var/lib/zabbix/ssl/keys && \
     mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
+    mkdir -p /usr/lib/zabbix/alertscripts && \
+    mkdir -p /usr/lib/zabbix/externalscripts && \
     mkdir -p /usr/share/doc/zabbix-server-postgresql && \
     apk add --clean-protected --no-cache \
             tini \
@@ -95,8 +95,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-server \
             --with-postgresql \
-# Does not support stable iksemel library
-#            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \

server-pgsql/alpine/README.md

@@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
 
     Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

server-pgsql/centos/Dockerfile

@@ -1,19 +1,77 @@
-FROM centos:centos7 as builder
+FROM centos:centos7
 
-ARG YUM_FLAGS_COMMON="-y"
+LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix server with PostgreSQL database support" \
+      org.opencontainers.image.licenses="GPL v2.0"
+            
+STOPSIGNAL SIGTERM
+            
+ENV TINI_VERSION=v0.19.0
+
+RUN set -eux && \
+    groupadd -g 1995 --system zabbix && \
+    adduser -r --shell /sbin/nologin \
+            -g zabbix -G dialout -G root \
+            -d /var/lib/zabbix/ -u 1997 \
+        zabbix && \
+    mkdir -p /etc/zabbix && \
+    mkdir -p /var/lib/zabbix && \
+    mkdir -p /var/lib/zabbix/enc && \
+    mkdir -p /var/lib/zabbix/export && \
+    mkdir -p /var/lib/zabbix/mibs && \
+    mkdir -p /var/lib/zabbix/modules && \
+    mkdir -p /var/lib/zabbix/snmptraps && \
+    mkdir -p /var/lib/zabbix/ssh_keys && \
+    mkdir -p /var/lib/zabbix/ssl && \
+    mkdir -p /var/lib/zabbix/ssl/certs && \
+    mkdir -p /var/lib/zabbix/ssl/keys && \
+    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
+    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 \
+            iputils \
+            traceroute \
+            libcurl \
+            libevent \
+            libxml2 \
+            net-snmp-libs \
+            OpenIPMI-libs \
+            openldap \
+            openssl-libs \
+            pcre \
+            postgresql \
+            postgresql-libs \
+            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 /tini.asc && \
+    gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
+    gpg --batch --verify /tini.asc /sbin/tini && \
+    rm -rf /root/.gnupg && \
+    chmod +x /sbin/tini && \
+    yum -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
 
 ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+
-    ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
+ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
 
 RUN set -eux && \
     yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \
+    yum -y install \
-                                 https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
-    yum ${YUM_FLAGS_DEV} install \
             autoconf \
             automake \
             gcc \
@@ -41,9 +99,8 @@ RUN set -eux && \
             --prefix=/usr \
             --sysconfdir=/etc/zabbix \
             --enable-agent \
-            --enable-${ZBX_TYPE} \
+            --enable-server \
-            --with-${ZBX_DB_TYPE} \
+            --with-postgresql \
-            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -56,93 +113,25 @@ RUN set -eux && \
             --silent && \
     make -j"$(nproc)" -s dbschema && \
     make -j"$(nproc)" -s && \
-    cat database/${ZBX_DB_TYPE}/schema.sql > database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
-    cat database/${ZBX_DB_TYPE}/images.sql >> database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cat database/${ZBX_DB_TYPE}/data.sql >> database/${ZBX_DB_TYPE}/create.sql && \
+    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    gzip database/${ZBX_DB_TYPE}/create.sql
+    cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
-
+    cat database/postgresql/schema.sql > database/postgresql/create.sql && \
-FROM centos:centos7
+    cat database/postgresql/images.sql >> database/postgresql/create.sql && \
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
+    cat database/postgresql/data.sql >> database/postgresql/create.sql && \
-
+    gzip database/postgresql/create.sql && \
-ARG BUILD_DATE
+    cp database/postgresql/create.sql.gz /usr/share/doc/zabbix-server-postgresql/ && \
-ARG VCS_REF
+    cp database/postgresql/timescaledb.sql /usr/share/doc/zabbix-server-postgresql/timescaledb.sql && \
-
+    cd /tmp/ && \
-ARG YUM_FLAGS_COMMON="-y"
+    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
-
+    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
-ARG MAJOR_VERSION=5.0
+    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-ARG ZBX_VERSION=${MAJOR_VERSION}
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+    yum -y clean all && \
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
-    TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
+    rm -rf /etc/udev/hwdb.bin /root/.pki
-    ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
-ENV TINI_VERSION v0.18.0
-
-LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix ${ZBX_TYPE} with PostgreSQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      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:centos-${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_${ZBX_TYPE}/zabbix_${ZBX_TYPE} /usr/sbin/zabbix_${ZBX_TYPE}
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
-COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/timescaledb.sql /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/timescaledb.sql
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
-
-RUN set -eux && \
-    groupadd --system zabbix && \
-    adduser -r --shell /sbin/nologin \
-            -g zabbix -G dialout \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    mkdir -p /etc/zabbix && \
-    mkdir -p /var/lib/zabbix && \
-    mkdir -p /usr/lib/zabbix/alertscripts && \
-    mkdir -p /var/lib/zabbix/enc && \
-    mkdir -p /var/lib/zabbix/export && \
-    mkdir -p /usr/lib/zabbix/externalscripts && \
-    mkdir -p /var/lib/zabbix/mibs && \
-    mkdir -p /var/lib/zabbix/modules && \
-    mkdir -p /var/lib/zabbix/snmptraps && \
-    mkdir -p /var/lib/zabbix/ssh_keys && \
-    mkdir -p /var/lib/zabbix/ssl && \
-    mkdir -p /var/lib/zabbix/ssl/certs && \
-    mkdir -p /var/lib/zabbix/ssl/keys && \
-    mkdir -p /var/lib/zabbix/ssl/ssl_ca && \
-    chown --quiet -R zabbix:root /var/lib/zabbix && \
-    mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTENT} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
-                                        https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm  && \
-    yum ${YUM_FLAGS_PERSISTENT} install \
-            iputils \
-            traceroute \
-            libcurl \
-            libevent \
-            libxml2 \
-            net-snmp-libs \
-            OpenIPMI-libs \
-            openldap \
-            openssl-libs \
-            pcre \
-            postgresql \
-            postgresql-libs \
-            unixODBC && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/ && \
-    chmod +x /sbin/tini
 
 EXPOSE 10051/TCP
 
@@ -155,3 +144,7 @@ VOLUME ["/var/lib/zabbix/export"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
+    
+USER 1997
+                                 
+CMD ["/usr/sbin/zabbix_server", "--foreground", "-c", "/etc/zabbix/zabbix_server.conf"]

server-pgsql/centos/README.md

@@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
 
     Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

server-pgsql/ubuntu/Dockerfile

@@ -58,7 +58,6 @@ RUN set -eux && \
             fping \
             libcurl4 \
             libevent-2.1 \
-            libiksemel3 \
             libopenipmi0 \
             libpcre3 \
             libpq5 \
@@ -95,7 +94,6 @@ RUN set -eux && \
             libc6-dev \
             libcurl4-openssl-dev \
             libevent-dev \
-            libiksemel-dev \
             libldap2-dev \
             libopenipmi-dev \
             libpcre3-dev \
@@ -122,7 +120,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-${ZBX_TYPE} \
             --with-${ZBX_DB_TYPE} \
-            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -155,7 +152,6 @@ RUN set -eux && \
             libc6-dev \
             libcurl4-openssl-dev \
             libevent-dev \
-            libiksemel-dev \
             libldap2-dev \
             libopenipmi-dev \
             libpcre3-dev \

server-pgsql/ubuntu/README.md

@@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se
 
 # Zabbix server images
 
-These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix server are:
 
     Zabbix server 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

snmptraps/alpine/README.md

@@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac
 
 # Zabbix snmptraps images
 
-These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are:
+These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are:
 
     Zabbix snmptraps 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

snmptraps/alpine/conf/etc/supervisor/supervisord.conf

@@ -33,4 +33,3 @@ serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 [include]
 files = /etc/supervisor/conf.d/*.conf
-

snmptraps/centos/Dockerfile

@@ -1,18 +1,38 @@
-FROM centos:centos7 as builder
+FROM centos:centos7
-
-ARG YUM_FLAGS_COMMON="-y"
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
 
 ARG MAJOR_VERSION=5.0
 ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
+
+LABEL org.opencontainers.image.title="zabbix-snmptraps-centos" \
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
+      org.opencontainers.image.vendor="Zabbix LLC" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix SNMP traps receiver" \
+      org.opencontainers.image.licenses="GPL v2.0" \
+      org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="https://anonscm.debian.org/gitweb/?p=collab-maint/snmptrapfmt.git"
+
+STOPSIGNAL SIGTERM
 
 COPY ["snmptrapfmt_1.14+nmu1ubuntu2.tar.gz", "/tmp/"]
 
 RUN set -eux && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
+    groupadd -g 1995 --system zabbix && \
-    yum ${YUM_FLAGS_DEV} install \
+    adduser -r --shell /sbin/nologin \
+            -g zabbix -G root \
+            -d /var/lib/zabbix/ -u 1997 \
+        zabbix && \
+    yum --quiet makecache && \
+    yum -y install epel-release && \
+    yum -y install --setopt=tsflags=nodocs \
+            net-snmp \
+            supervisor && \
+    yum -y install --setopt=tsflags=nodocs \
             autoconf \
             automake \
             gcc \
@@ -20,61 +40,19 @@ RUN set -eux && \
             make \
             libnsl-devel \
             net-snmp-devel && \
-    cd /tmp/ && \
-    tar -zxf snmptrapfmt_1.14+nmu1ubuntu2.tar.gz && \
-    cd /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \
-    patch -p1 < ./patches/makefile.patch && \
-    make -j"$(nproc)" -s
-
-FROM centos:centos7
-LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
-
-ARG BUILD_DATE
-ARG VCS_REF
-
-ARG YUM_FLAGS_COMMON="-y"
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
-
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
-
-LABEL org.label-schema.name="zabbix-snmptraps-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix SNMP traps receiver" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="1.14" \
-      org.label-schema.vcs-url="https://anonscm.debian.org/gitweb/?p=collab-maint/snmptrapfmt.git" \
-      org.label-schema.docker.cmd="docker run --name zabbix-snmptraps --link zabbix-server:zabbix-server -p 162:162/UDP -d zabbix-snmptraps:centos-${ZBX_VERSION}"
-
-STOPSIGNAL SIGTERM
-
-COPY --from=builder /tmp/snmptrapfmt-1.14+nmu1ubuntu1/snmptrapfmthdlr /usr/sbin/snmptrapfmthdlr
-COPY --from=builder /tmp/snmptrapfmt-1.14+nmu1ubuntu1/snmptrapfmt /usr/sbin/snmptrapfmt
-COPY --from=builder /tmp/snmptrapfmt-1.14+nmu1ubuntu1/snmptrapfmt.conf /etc/snmp/snmptrapfmt.conf
-
-RUN set -eux && \
-    groupadd --system zabbix && \
-    adduser -r --shell /sbin/nologin \
-            -g zabbix \
-            -d /var/lib/zabbix/ \
-        zabbix && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
-    yum ${YUM_FLAGS_PERSISTENT} install \
-            net-snmp \
-            supervisor && \
     mkdir -p /var/lib/zabbix && \
     mkdir -p /var/lib/zabbix/snmptraps && \
     mkdir -p /var/lib/zabbix/mibs && \
-    chown --quiet -R zabbix:root /var/lib/zabbix && \
+    cd /tmp/ && \
+    tar -zxvf snmptrapfmt_1.14+nmu1ubuntu2.tar.gz && \
+    ls -lah && \
+    cd /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \
+    patch -p1 < ./patches/makefile.patch && \
+    patch -p1 < ./patches/pid_location.patch && \
+    make -j"$(nproc)" -s && \
+    cp snmptrapfmthdlr /usr/sbin/snmptrapfmthdlr && \
+    cp snmptrapfmt /usr/sbin/snmptrapfmt && \
+    cp snmptrapfmt.conf /etc/snmp/snmptrapfmt.conf && \
     echo "disableAuthorization yes" >> "/etc/snmp/snmptrapd.conf" && \
     echo "traphandle default /usr/sbin/snmptrapfmthdlr" >> "/etc/snmp/snmptrapd.conf" && \
     sed -i \
@@ -82,10 +60,17 @@ RUN set -eux && \
             -e '/^LOGFMT=/s/=.*/=\"$x ZBXTRAP $R $G $S $e $*\"/' \
             -e "/^LOGFILE=/s/=.*/=\"\/var\/lib\/zabbix\/snmptraps\/snmptraps.log\"/" \
         "/etc/snmp/snmptrapfmt.conf" && \
-    yum ${YUM_FLAGS_COMMON} clean all && \
+    rm -rf /tmp/snmptrapfmt_1.14+nmu1ubuntu2.tar.gz && \
-    rm -rf /var/cache/yum
+    rm -rf /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \
+    chown --quiet -R zabbix:root /etc/snmp/ /var/lib/zabbix/ /var/tmp/ /var/run/ && \
+    chgrp -R 0 /etc/snmp/ /var/lib/zabbix/ /var/tmp/ /var/run/ && \
+    chmod -R g=u /etc/snmp/ /var/lib/zabbix/ /var/tmp/ /var/run/ && \
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
+    yum -y clean all && \
+    rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \
+    rm -rf /var/cache/dnf /etc/udev/hwdb.bin /root/.pki
 
-EXPOSE 162/UDP
+EXPOSE 1162/UDP
 
 WORKDIR /var/lib/zabbix/snmptraps/
 
@@ -94,4 +79,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/mibs"]
 COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
 COPY ["conf/etc/logrotate.d/zabbix_snmptraps", "/etc/logrotate.d/"]
 
+USER 1997
+
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

snmptraps/centos/README.md

@@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac
 
 # Zabbix snmptraps images
 
-These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are:
+These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are:
 
     Zabbix snmptraps 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf

@@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout
 stdout_logfile_maxbytes = 0
 
 [program:snmptrapd]
-command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs/:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf
+command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs/:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf udp:0.0.0.0:1162
 auto_start = true
 autorestart = true
 priority = 100

snmptraps/centos/conf/etc/supervisor/supervisord.conf

@@ -1,17 +1,17 @@
 ; supervisor config file
 
 [unix_http_server]
-file = /var/run/supervisor.sock   ; (the path to the socket file)
+file = /tmp/supervisor.sock        ; (the path to the socket file)
 chmod = 0700                       ; sockef file mode (default 0700)
 username = zbx
 password = password
 
 [supervisord]
 logfile = /dev/stdout                        ; (main log file;default $CWD/supervisord.log)
-pidfile = /var/run/supervisord.pid           ; (supervisord pidfile;default supervisord.pid)
+pidfile = /tmp/supervisord.pid               ; (supervisord pidfile;default supervisord.pid)
 childlogdir = /tmp                           ; ('AUTO' child log dir, default $TEMP)
 critical = critical
-user = root
+;user = zabbix
 logfile_maxbytes = 0
 logfile_backupcount = 0
 loglevel = info
@@ -23,7 +23,7 @@ loglevel = info
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or

snmptraps/ubuntu/README.md

@@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac
 
 # Zabbix snmptraps images
 
-These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are:
+These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix snmptraps are:
 
     Zabbix snmptraps 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix snmptraps 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-apache-mysql/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-apache-mysql/alpine/docker-entrypoint.sh

@@ -60,6 +60,10 @@ file_env() {
     unset "$fileVar"
 }
 
+prepare_system() {
+    echo "** Preparing the system"
+}
+
 escape_spec_char() {
     local var_value=$1
 
@@ -202,6 +206,10 @@ prepare_web_server() {
     fi
 }
 
+clear_deploy() {
+    echo "** Cleaning the system"
+}
+
 prepare_zbx_web_config() {
     local server_name=""
 
@@ -269,9 +277,9 @@ echo "########################################################"
 if [ "$1" != "" ]; then
     echo "** Executing '$@'"
     exec "$@"
-elif [ -f "/usr/bin/supervisord" ]; then
+elif [ -f "/usr/sbin/httpd" ]; then
-    echo "** Executing supervisord"
+    echo "** Executing HTTPD"
-    exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+    exec /usr/sbin/httpd -D FOREGROUND
 else
     echo "Unknown instructions. Exiting..."
     exit 1

web-apache-mysql/centos/Dockerfile

@@ -1,71 +1,24 @@
-FROM centos:centos7 as builder
-
-ARG YUM_FLAGS_COMMON="-y"
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
-
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
-
-RUN set -eux && \
-    yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
-            gettext \
-            git && \
-    cd /tmp/ && \
-    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /tmp/zabbix/ && \
-    cp -R /tmp/zabbix-${ZBX_VERSION}/frontends/php/* /tmp/zabbix/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    cd /tmp/zabbix/ && \
-    rm -f conf/zabbix.conf.php && \
-    rm -rf tests && \
-    ./locale/make_mo.sh
-
 FROM centos:centos7
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
 
-ARG BUILD_DATE
+LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
-ARG VCS_REF
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
-
+      org.opencontainers.image.vendor="Zabbix LLC" \
-ARG YUM_FLAGS_COMMON="-y"
+      org.opencontainers.image.url="https://zabbix.com/" \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \
-
+      org.opencontainers.image.licenses="GPL v2.0"
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=apache
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}:centos-${ZBX_VERSION}"
 
 STOPSIGNAL SIGTERM
 
-COPY --from=builder /tmp/zabbix/ /usr/share/zabbix/
-
 RUN set -eux && \
-    groupadd --system zabbix && \
+    groupadd -g 1995 --system zabbix && \
     adduser -r --shell /sbin/nologin \
-            -g zabbix \
+            -g zabbix -G root \
-            -d /var/lib/zabbix/ \
+            -d /var/lib/zabbix/ -u 1997 \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
+    yum --quiet makecache && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
+    yum -y install --setopt=tsflags=nodocs \
-    yum ${YUM_FLAGS_PERSISTENT} install \
             dejavu-sans-fonts \
             curl \
             httpd \
@@ -78,23 +31,71 @@ RUN set -eux && \
             php-mbstring \
             php-mysql \
             php-xml && \
+    rm -f "/etc/httpd/conf.d/default.conf" && \
+    rm -f "/etc/httpd/conf.d/ssl.conf" && \
+    sed -ri \
+        -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
+        -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
+        "/etc/httpd/conf/httpd.conf" && \
+    sed -i 's/Listen 80/Listen 8080/g' /etc/httpd/conf/httpd.conf && \
+    yum -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 
+
+ARG MAJOR_VERSION=5.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
+
+COPY ["conf/etc/", "/etc/"]
+
+RUN set -eux && \
+    yum --quiet makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+            gettext \
+            git && \
+    cd /usr/share/ && \
+    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
+    mkdir /usr/share/zabbix/ && \
+    cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
+    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
+    cd /usr/share/zabbix/ && \
+    rm -f conf/zabbix.conf.php && \
+    rm -rf tests && \
+    ./locale/make_mo.sh && \
+    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
                 cut -d"'" -f 2 | sort | \
                 xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
-    chown --quiet -R apache:apache /usr/share/zabbix && \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    rm -rf /var/cache/yum/
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chown --quiet -R zabbix:root /etc/httpd/ /etc/php.d/ /etc/php.ini && \
+    chgrp -R 0 /etc/httpd/ /etc/php.d/ /etc/php.ini && \
+    chmod -R g=u /etc/httpd/ /etc/php.d/ /etc/php.ini && \
+    chown --quiet -R zabbix:root /run/httpd/ /var/lib/php/session/ && \
+    chgrp -R 0 /run/httpd/ /var/lib/php/session/ && \
+    chmod -R g=u /run/httpd/ /var/lib/php/session/ && \
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
+    yum -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
 
-EXPOSE 80/TCP 443/TCP
+EXPOSE 8080/TCP 8443/TCP
 
 WORKDIR /usr/share/zabbix
 
 VOLUME ["/etc/ssl/apache2"]
 
-COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
-COPY ["conf/etc/php.d/99-zabbix.ini", "/etc/php.d/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
+USER 1997
+
 ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["/usr/sbin/httpd", "-D", "FOREGROUND"]

web-apache-mysql/centos/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-apache-mysql/centos/conf/etc/httpd/conf.d/99-zabbix.conf

@@ -0,0 +1,3 @@
+<IfModule !mpm_netware_module>
+    PidFile "/tmp/httpd.pid"
+</IfModule>

web-apache-mysql/centos/conf/etc/php.d/99-zabbix.ini

@@ -6,4 +6,3 @@ max_input_time=300
 always_populate_raw_post_data=-1
 max_input_vars=10000
 ; date.timezone=Europe/Riga
-; session.save_path=/var/lib/php5

web-apache-mysql/centos/conf/etc/zabbix/apache.conf

@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
     DocumentRoot /usr/share/zabbix/
     ServerName zabbix
     DirectoryIndex index.php

web-apache-mysql/centos/conf/etc/zabbix/apache_ssl.conf

@@ -1,9 +1,9 @@
 LoadModule ssl_module modules/mod_ssl.so
 LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 
-Listen 443
+Listen 8443
 
-    <VirtualHost *:443>
+    <VirtualHost *:8443>
         SSLEngine on
 
         DocumentRoot /usr/share/zabbix/

web-apache-mysql/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-apache-pgsql/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-apache-pgsql/alpine/docker-entrypoint.sh

@@ -272,9 +272,9 @@ echo "########################################################"
 if [ "$1" != "" ]; then
     echo "** Executing '$@'"
     exec "$@"
-elif [ -f "/usr/bin/supervisord" ]; then
+elif [ -f "/usr/sbin/httpd" ]; then
-    echo "** Executing supervisord"
+    echo "** Executing HTTPD"
-    exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
+    exec /usr/sbin/httpd -D FOREGROUND
 else
     echo "Unknown instructions. Exiting..."
     exit 1

web-apache-pgsql/centos/Dockerfile

@@ -1,73 +1,25 @@
-FROM centos:centos7 as builder
-
-ARG YUM_FLAGS_COMMON="-y"
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
-
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
-
-RUN set -eux && \
-    yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
-            gettext \
-            patch \
-            git && \
-    cd /tmp/ && \
-    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /tmp/zabbix/ && \
-    cp -R /tmp/zabbix-${ZBX_VERSION}/frontends/php/* /tmp/zabbix/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    cd /tmp/zabbix/ && \
-    rm -f conf/zabbix.conf.php && \
-    rm -rf tests && \
-    ./locale/make_mo.sh
-
 FROM centos:centos7
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
 
-ARG BUILD_DATE
+LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
-ARG VCS_REF
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
-
+      org.opencontainers.image.vendor="Zabbix LLC" \
-ARG YUM_FLAGS_COMMON="-y"
+      org.opencontainers.image.url="https://zabbix.com/" \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \
-
+      org.opencontainers.image.licenses="GPL v2.0"
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-pgsql --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-pgsql:centos-${ZBX_VERSION}"
 
 STOPSIGNAL SIGTERM
 
-COPY --from=builder /tmp/zabbix/ /usr/share/zabbix/
-
 RUN set -eux && \
-    groupadd --system zabbix && \
+    groupadd -g 1995 --system zabbix && \
     adduser -r --shell /sbin/nologin \
-            -g zabbix \
+            -g zabbix -G root \
-            -d /var/lib/zabbix/ \
+            -d /var/lib/zabbix/ -u 1997 \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
+    yum --quiet makecache && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
+    yum -y install --setopt=tsflags=nodocs \
-    yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
+            dejavu-sans-fonts \
-    yum ${YUM_FLAGS_PERSISTENT} install \
             curl \
             httpd \
             mod_ssl \
@@ -79,23 +31,71 @@ RUN set -eux && \
             php-pgsql \
             php-xml \
             postgresql && \
+    rm -f "/etc/httpd/conf.d/default.conf" && \
+    rm -f "/etc/httpd/conf.d/ssl.conf" && \
+    sed -ri \
+        -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
+        -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
+        "/etc/httpd/conf/httpd.conf" && \
+    sed -i 's/Listen 80/Listen 8080/g' /etc/httpd/conf/httpd.conf && \
+    yum -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 
+
+ARG MAJOR_VERSION=5.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
+
+COPY ["conf/etc/", "/etc/"]
+
+RUN set -eux && \
+    yum --quiet makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+            gettext \
+            git && \
+    cd /usr/share/ && \
+    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
+    mkdir /usr/share/zabbix/ && \
+    cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
+    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
+    cd /usr/share/zabbix/ && \
+    rm -f conf/zabbix.conf.php && \
+    rm -rf tests && \
+    ./locale/make_mo.sh && \
+    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
                 cut -d"'" -f 2 | sort | \
                 xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
-    chown --quiet -R apache:apache /usr/share/zabbix && \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    rm -rf /var/cache/yum/
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chown --quiet -R zabbix:root /etc/httpd/ /etc/php.d/ /etc/php.ini && \
+    chgrp -R 0 /etc/httpd/ /etc/php.d/ /etc/php.ini && \
+    chmod -R g=u /etc/httpd/ /etc/php.d/ /etc/php.ini && \
+    chown --quiet -R zabbix:root /run/httpd/ /var/lib/php/session/ && \
+    chgrp -R 0 /run/httpd/ /var/lib/php/session/ && \
+    chmod -R g=u /run/httpd/ /var/lib/php/session/ && \
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
+    yum -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
 
-EXPOSE 80/TCP 443/TCP
+EXPOSE 8080/TCP 8443/TCP
 
 WORKDIR /usr/share/zabbix
 
 VOLUME ["/etc/ssl/apache2"]
 
-COPY ["conf/etc/zabbix/apache.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/apache_ssl.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
-COPY ["conf/etc/php.d/99-zabbix.ini", "/etc/php.d/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
+USER 1997
+
 ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["/usr/sbin/httpd", "-D", "FOREGROUND"]

web-apache-pgsql/centos/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-apache-pgsql/centos/conf/etc/httpd/conf.d/99-zabbix.conf

@@ -0,0 +1,3 @@
+<IfModule !mpm_netware_module>
+    PidFile "/tmp/httpd.pid"
+</IfModule>

web-apache-pgsql/centos/conf/etc/php.d/99-zabbix.ini

@@ -6,4 +6,3 @@ max_input_time=300
 always_populate_raw_post_data=-1
 max_input_vars=10000
 ; date.timezone=Europe/Riga
-; session.save_path=/var/lib/php5

web-apache-pgsql/centos/conf/etc/zabbix/apache.conf

@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
     DocumentRoot /usr/share/zabbix/
     ServerName zabbix
     DirectoryIndex index.php

web-apache-pgsql/centos/conf/etc/zabbix/apache_ssl.conf

@@ -1,9 +1,9 @@
 LoadModule ssl_module modules/mod_ssl.so
 LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
 
-Listen 443
+Listen 8443
 
-    <VirtualHost *:443>
+    <VirtualHost *:8443>
         SSLEngine on
 
         DocumentRoot /usr/share/zabbix/

web-apache-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php

@@ -2,7 +2,7 @@
 // Zabbix GUI configuration file.
 global $DB, $HISTORY;
 
-$DB['TYPE']     = 'MYSQL';
+$DB['TYPE']     = 'POSTGRESQL';
 $DB['SERVER']   = '{DB_SERVER_HOST}';
 $DB['PORT']     = '{DB_SERVER_PORT}';
 $DB['DATABASE'] = '{DB_SERVER_DBNAME}';

web-apache-pgsql/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-nginx-mysql/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-nginx-mysql/centos/Dockerfile

@@ -1,74 +1,25 @@
-FROM centos:centos7 as builder
-
-ARG YUM_FLAGS_COMMON="-y"
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
-
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
-
-RUN set -eux && \
-    yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
-            gettext \
-            patch \
-            git && \
-    cd /tmp/ && \
-    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /tmp/zabbix/ && \
-    cp -R /tmp/zabbix-${ZBX_VERSION}/frontends/php/* /tmp/zabbix/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    cd /tmp/zabbix/ && \
-    rm -f conf/zabbix.conf.php && \
-    rm -rf tests && \
-    ./locale/make_mo.sh
-
 FROM centos:centos7
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
 
-ARG BUILD_DATE
+LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
-ARG VCS_REF
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
-
+      org.opencontainers.image.vendor="Zabbix LLC" \
-ARG YUM_FLAGS_COMMON="-y"
+      org.opencontainers.image.url="https://zabbix.com/" \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
-
+      org.opencontainers.image.licenses="GPL v2.0"
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}:centos-${ZBX_VERSION}"
 
 STOPSIGNAL SIGTERM
 
-COPY --from=builder /tmp/zabbix/ /usr/share/zabbix/
-
 RUN set -eux && \
-    groupadd --system zabbix && \
+    groupadd -g 1995 --system zabbix && \
     adduser -r --shell /sbin/nologin \
-            -g zabbix \
+            -g zabbix -G root \
-            -d /var/lib/zabbix/ \
+            -d /var/lib/zabbix/ -u 1997 \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
+    yum --quiet makecache && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
+    yum -y install epel-release && \
-    yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
+    yum -y install --setopt=tsflags=nodocs \
-    yum ${YUM_FLAGS_PERSISTENT} install \
             curl \
             mariadb \
             nginx \
@@ -81,29 +32,60 @@ RUN set -eux && \
             php-xml \
             supervisor && \
     rm -f /etc/nginx/conf.d/*.conf  && \
+    rm -f /etc/php-fpm.d/www.conf && \
+    yum -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
+
+ARG MAJOR_VERSION=5.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
+
+COPY ["conf/etc/", "/etc/"]
+
+RUN set -eux && \
+    yum --quiet makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+            gettext \
+            git && \
+    cd /usr/share/ && \
+    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
+    mkdir /usr/share/zabbix/ && \
+    cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
+    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
+    cd /usr/share/zabbix/ && \
+    rm -f conf/zabbix.conf.php && \
+    rm -rf tests && \
+    ./locale/make_mo.sh && \
+    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
                 cut -d"'" -f 2 | sort | \
                 xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
-    rm -f /etc/php-fpm.d/www.conf && \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    mkdir -p /var/lib/php/ && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    chown --quiet -R nginx:nginx /var/lib/php/ && \
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    chown --quiet -R nginx:nginx /usr/share/zabbix && \
+    chown --quiet -R zabbix:root /etc/nginx/ /etc/php.d/ /etc/php.ini && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
+    chgrp -R 0 /etc/nginx/ /etc/php.d/ /etc/php.ini && \
-    rm -rf /var/cache/yum/
+    chmod -R g=u /etc/nginx/ /etc/php.d/ /etc/php.ini && \
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
+    yum -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
 
-EXPOSE 80/TCP 443/TCP
+EXPOSE 8080/TCP 8443/TCP
 
 WORKDIR /usr/share/zabbix
 
 VOLUME ["/etc/ssl/nginx"]
 
-COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
-COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/nginx_ssl.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
-COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"]
-COPY ["conf/etc/php-fpm.conf", "/etc/php-fpm.conf"]
-COPY ["conf/etc/php.d/99-zabbix.ini", "/etc/php.d/99-zabbix.ini"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
+USER 1997
+
 ENTRYPOINT ["docker-entrypoint.sh"]

web-nginx-mysql/centos/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-nginx-mysql/centos/conf/etc/nginx/nginx.conf

@@ -1,10 +1,10 @@
-user nginx;
+#user nginx;
 worker_processes 5;
 worker_rlimit_nofile 256000;
 
 error_log /dev/fd/2 warn;
 
-pid        /var/run/nginx.pid;
+pid        /tmp/nginx.pid;
 
 events {
     worker_connections 5120;

web-nginx-mysql/centos/conf/etc/php-fpm.conf

@@ -12,7 +12,6 @@
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include = /etc/php-fpm.d/*.conf
 
 ;;;;;;;;;;;;;;;;;;
 ; Global Options ;
@@ -29,7 +28,7 @@ include = /etc/php-fpm.d/*.conf
 ; in a local file.
 ; Note: the default prefix is /var
 ; Default Value: log/php-fpm.log
-error_log = /var/log/php-fpm.log
+error_log = /dev/fd/2
 
 ; syslog_facility is used to specify what type of program is logging the
 ; message. This lets syslogd specify that messages from different facilities
@@ -146,8 +145,8 @@ error_log = /var/log/php-fpm.log
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-user = nginx
+;user = nginx
-group = nginx
+;group = nginx
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -161,7 +160,7 @@ group = nginx
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php5-fpm.sock
+listen = /tmp/php-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
@@ -172,8 +171,8 @@ listen = /var/run/php5-fpm.sock
 ; BSD-derived systems allow connections regardless of permissions. 
 ; Default Values: user and group are set as the running user
 ;                 mode is set to 0660
-listen.owner = nginx
+;listen.owner = nginx
-listen.group = nginx
+;listen.group = nginx
 ;listen.mode = 0660
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.

web-nginx-mysql/centos/conf/etc/php.d/99-zabbix.ini

@@ -6,4 +6,3 @@ max_input_time=300
 always_populate_raw_post_data=-1
 max_input_vars=10000
 ; date.timezone=Europe/Riga
-session.save_path=/var/lib/php/

web-nginx-mysql/centos/conf/etc/supervisor/supervisord.conf

@@ -1,17 +1,17 @@
 ; supervisor config file
 
 [unix_http_server]
-file = /var/run/supervisor.sock   ; (the path to the socket file)
+file = /tmp/supervisor.sock        ; (the path to the socket file)
 chmod = 0700                       ; sockef file mode (default 0700)
 username = zbx
 password = password
 
 [supervisord]
 logfile = /dev/stdout                        ; (main log file;default $CWD/supervisord.log)
-pidfile = /var/run/supervisord.pid           ; (supervisord pidfile;default supervisord.pid)
+pidfile = /tmp/supervisord.pid               ; (supervisord pidfile;default supervisord.pid)
 childlogdir = /tmp                           ; ('AUTO' child log dir, default $TEMP)
 critical = critical
-user = root
+;user = zabbix
 logfile_maxbytes = 0
 logfile_backupcount = 0
 loglevel = info
@@ -23,7 +23,7 @@ loglevel = info
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or

web-nginx-mysql/centos/conf/etc/zabbix/nginx.conf

@@ -1,5 +1,5 @@
 server {
-    listen          80;
+    listen          8080;
     server_name     zabbix;
     index           index.php;
 
@@ -51,7 +51,7 @@ server {
     }
 
     location ~ .php$ {
-        fastcgi_pass   unix:/var/run/php5-fpm.sock;
+        fastcgi_pass   unix:/tmp/php-fpm.sock;
         fastcgi_index  index.php;
 
         fastcgi_param  SCRIPT_FILENAME  $webroot$fastcgi_script_name;

web-nginx-mysql/centos/conf/etc/zabbix/nginx_ssl.conf

@@ -1,5 +1,5 @@
 server {
-    listen          443 ssl http2;
+    listen          8443 ssl http2;
     server_name     zabbix;
     server_name_in_redirect off;
 
@@ -75,7 +75,7 @@ server {
     }
 
     location ~ .php$ {
-        fastcgi_pass   unix:/var/run/php5-fpm.sock;
+        fastcgi_pass   unix:/tmp/php-fpm.sock;
         fastcgi_index  index.php;
 
         fastcgi_param  SCRIPT_FILENAME  $webroot$fastcgi_script_name;

web-nginx-mysql/centos/docker-entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eo pipefail
+set -o pipefail
 
 set +e
 
@@ -9,16 +9,6 @@ if [ "${DEBUG_MODE}" == "true" ]; then
     set -o xtrace
 fi
 
-# Type of Zabbix component
-# Possible values: [server, proxy, agent, frontend, java-gateway, appliance]
-zbx_type=${ZBX_TYPE}
-# Type of Zabbix database
-# Possible values: [mysql, postgresql]
-zbx_db_type=${ZBX_DB_TYPE}
-# Type of web-server. Valid only with zbx_type = frontend
-# Possible values: [apache, nginx]
-zbx_opt_type=${ZBX_OPT_TYPE}
-
 # Default Zabbix installation name
 # Used only by Zabbix web-interface
 ZBX_SERVER_NAME=${ZBX_SERVER_NAME:-"Zabbix docker"}
@@ -72,90 +62,8 @@ file_env() {
     unset "$fileVar"
 }
 
-configure_db_mysql() {
-    [ "${DB_SERVER_HOST}" != "localhost" ] && return
-
-    echo "** Configuring local MySQL server"
-
-    MYSQL_ALLOW_EMPTY_PASSWORD=true
-    MYSQL_DATA_DIR="/var/lib/mysql"
-
-    if [ -f "/etc/mysql/my.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/mysql/my.cnf"
-    elif [ -f "/etc/my.cnf.d/server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/server.cnf"
-        DB_SERVER_SOCKET="/var/lib/mysql/mysql.sock"
-    elif [ -f "/etc/my.cnf.d/mariadb-server.cnf" ]; then
-        MYSQL_CONF_FILE="/etc/my.cnf.d/mariadb-server.cnf"
-        DB_SERVER_SOCKET="/var/run/mysqld/mysqld.sock"
-    else
-        echo "**** Could not found MySQL configuration file"
-        exit 1
-    fi
-
-    if [ -f "/usr/bin/mysqld" ]; then
-        MYSQLD=/usr/bin/mysqld
-    elif [ -f "/usr/sbin/mysqld" ]; then
-        MYSQLD=/usr/sbin/mysqld
-    elif [ -f "/usr/libexec/mysqld" ]; then
-        MYSQLD=/usr/libexec/mysqld
-    else
-        echo "**** Could not found mysqld binary file"
-        exit 1
-    fi
-
-    sed -Ei 's/^(bind-address|log)/#&/' "$MYSQL_CONF_FILE"
-
-    if [ ! -d "$MYSQL_DATA_DIR/mysql" ]; then
-        [ -d "$MYSQL_DATA_DIR" ] || mkdir -p "$MYSQL_DATA_DIR"
-
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-
-        echo "** Installing initial MySQL database schemas"
-        mysql_install_db --user=mysql --datadir="$MYSQL_DATA_DIR" 2>&1
-    else
-        echo "**** MySQL data directory is not empty. Using already existing installation."
-        chown -R mysql:mysql "$MYSQL_DATA_DIR"
-    fi
-
-    mkdir -p /var/run/mysqld
-    ln -s /var/run/mysqld /run/mysqld
-    chown -R mysql:mysql /var/run/mysqld
-    chown -R mysql:mysql /run/mysqld
-
-    echo "** Starting MySQL server in background mode"
-
-    nohup $MYSQLD --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin \
-            --user=mysql --log-output=none --pid-file=/var/lib/mysql/mysqld.pid \
-            --port=3306 --character-set-server=utf8 --collation-server=utf8_bin &
-}
-
 prepare_system() {
-    local type=$1
-    local web_server=$2
-
     echo "** Preparing the system"
-
-    if [ "$type" != "appliance" ]; then
-        return
-    fi
-
-    ZBX_ADD_AGENT=${ZBX_ADD_AGENT:-"false"}
-    ZBX_ADD_JAVA_GATEWAY=${ZBX_ADD_JAVA_GATEWAY:-"false"}
-    ZBX_ADD_SERVER=${ZBX_ADD_SERVER:-"true"}
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_HOST="localhost"
-    [ "${ZBX_ADD_SERVER}" == "true" ] && ZBX_SERVER_PORT="10051"
-    ZBX_MAIN_DB=${ZBX_MAIN_DB:-"mysql"}
-    ZBX_ADD_PROXY=${ZBX_ADD_PROXY:-"false"}
-    ZBX_PROXY_DB=${ZBX_PROXY_DB:-"sqlite3"}
-    ZBX_ADD_WEB=${ZBX_ADD_WEB:-"true"}
-    ZBX_WEB_SERVER=${ZBX_WEB_SERVER:-"nginx"}
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"localhost"}
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY_ENABLE="true"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAY="localhost"
-    [ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && ZBX_JAVAGATEWAYPORT="10052"
-
-    [ "${ZBX_ADD_SERVER}" == "true" ] && configure_db_${ZBX_MAIN_DB}
 }
 
 escape_spec_char() {
@@ -240,20 +148,14 @@ update_config_multiple_var() {
 }
 
 # Check prerequisites for MySQL database
-check_variables_mysql() {
+check_variables() {
-    local type=$1
+    : ${DB_SERVER_HOST:="mysql-server"}
-
+    : ${DB_SERVER_PORT:="3306"}
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"mysql-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"3306"}
     USE_DB_ROOT_USER=false
     CREATE_ZBX_DB_USER=false
     file_env MYSQL_USER
     file_env MYSQL_PASSWORD
 
-    if [ "$type" != "" ]; then
-        file_env MYSQL_ROOT_PASSWORD
-    fi
-
     if [ ! -n "${MYSQL_USER}" ] && [ "${MYSQL_RANDOM_ROOT_PASSWORD}" == "true" ]; then
         echo "**** Impossible to use MySQL server because of unknown Zabbix user and random 'root' password"
         exit 1
@@ -273,45 +175,15 @@ check_variables_mysql() {
     [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true
 
     # If root password is not specified use provided credentials
-    DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}
+    : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}}....
     [ "${MYSQL_ALLOW_EMPTY_PASSWORD}" == "true" ] || DB_SERVER_ROOT_PASS=${DB_SERVER_ROOT_PASS:-${MYSQL_PASSWORD}}
     DB_SERVER_ZBX_USER=${MYSQL_USER:-"zabbix"}
     DB_SERVER_ZBX_PASS=${MYSQL_PASSWORD:-"zabbix"}
 
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix_proxy"}
-    else
     DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
-    fi
 }
 
-# Check prerequisites for PostgreSQL database
+check_db_connect() {
-check_variables_postgresql() {
-    local type=$1
-
-    file_env POSTGRES_USER
-    file_env POSTGRES_PASSWORD
-
-    DB_SERVER_HOST=${DB_SERVER_HOST:-"postgres-server"}
-    DB_SERVER_PORT=${DB_SERVER_PORT:-"5432"}
-    CREATE_ZBX_DB_USER=${CREATE_ZBX_DB_USER:-"false"}
-
-    DB_SERVER_ROOT_USER=${POSTGRES_USER:-"postgres"}
-    DB_SERVER_ROOT_PASS=${POSTGRES_PASSWORD:-""}
-
-    DB_SERVER_ZBX_USER=${POSTGRES_USER:-"zabbix"}
-    DB_SERVER_ZBX_PASS=${POSTGRES_PASSWORD:-"zabbix"}
-
-    DB_SERVER_SCHEMA=${DB_SERVER_SCHEMA:-"public"}
-
-    if [ "$type" == "proxy" ]; then
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix_proxy"}
-    else
-        DB_SERVER_DBNAME=${POSTGRES_DB:-"zabbix"}
-    fi
-}
-
-check_db_connect_mysql() {
     echo "********************"
     echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
     echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
@@ -336,307 +208,9 @@ check_db_connect_mysql() {
     done
 }
 
-check_db_connect_postgresql() {
+prepare_web_server() {
-    echo "********************"
-    echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
-    echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
-    echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
-    echo "* DB_SERVER_SCHEMA: ${DB_SERVER_SCHEMA}"
-    if [ "${DEBUG_MODE}" == "true" ]; then
-        if [ "${USE_DB_ROOT_USER}" == "true" ]; then
-            echo "* DB_SERVER_ROOT_USER: ${DB_SERVER_ROOT_USER}"
-            echo "* DB_SERVER_ROOT_PASS: ${DB_SERVER_ROOT_PASS}"
-        fi
-        echo "* DB_SERVER_ZBX_USER: ${DB_SERVER_ZBX_USER}"
-        echo "* DB_SERVER_ZBX_PASS: ${DB_SERVER_ZBX_PASS}"
-    fi
-    echo "********************"
-
-    if [ "${USE_DB_ROOT_USER}" != "true" ]; then
-        DB_SERVER_ROOT_USER=${DB_SERVER_ZBX_USER}
-        DB_SERVER_ROOT_PASS=${DB_SERVER_ZBX_PASS}
-    fi
-
-
-    if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-        export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-    fi
-
-    WAIT_TIMEOUT=5
-    
-    if [ -n "${DB_SERVER_SCHEMA}" ]; then
-        PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-        export PGOPTIONS
-    fi
-
-    while [ ! "$(psql -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} -U ${DB_SERVER_ROOT_USER} -d ${DB_SERVER_DBNAME} -l -q 2>/dev/null)" ]; do
-        echo "**** PostgreSQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
-        sleep $WAIT_TIMEOUT
-    done
-
-    unset PGPASSWORD
-    unset PGOPTIONS
-}
-
-
-mysql_query() {
-    query=$1
-    local result=""
-
-    result=$(mysql --silent --skip-column-names -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-             -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}" -e "$query")
-
-    echo $result
-}
-
-psql_query() {
-    query=$1
-    db=$2
-
-    local result=""
-
-    if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-        export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-    fi
-    
-    if [ -n "${DB_SERVER_SCHEMA}" ]; then
-        PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-        export PGOPTIONS
-    fi
-
-    result=$(psql -A -q -t  -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-             -U ${DB_SERVER_ROOT_USER} -c "$query" $db 2>/dev/null);
-
-    unset PGPASSWORD
-    unset PGOPTIONS
-
-    echo $result
-}
-
-create_db_user_mysql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in MySQL database"
-
-    USER_EXISTS=$(mysql_query "SELECT 1 FROM mysql.user WHERE user = '${DB_SERVER_ZBX_USER}' AND host = '%'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        mysql_query "CREATE USER '${DB_SERVER_ZBX_USER}'@'%' IDENTIFIED BY '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        mysql_query "ALTER USER ${DB_SERVER_ZBX_USER} IDENTIFIED BY '${DB_SERVER_ZBX_PASS}';" 1>/dev/null
-    fi
-
-    mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-}
-
-create_db_user_postgresql() {
-    [ "${CREATE_ZBX_DB_USER}" == "true" ] || return
-
-    echo "** Creating '${DB_SERVER_ZBX_USER}' user in PostgreSQL database"
-
-    USER_EXISTS=$(psql_query "SELECT 1 FROM pg_roles WHERE rolname='${DB_SERVER_ZBX_USER}'")
-
-    if [ -z "$USER_EXISTS" ]; then
-        psql_query "CREATE USER ${DB_SERVER_ZBX_USER} WITH PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    else
-        psql_query "ALTER USER ${DB_SERVER_ZBX_USER} WITH ENCRYPTED PASSWORD '${DB_SERVER_ZBX_PASS}'" 1>/dev/null
-    fi
-}
-
-create_db_database_mysql() {
-    DB_EXISTS=$(mysql_query "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        mysql_query "CREATE DATABASE ${DB_SERVER_DBNAME} CHARACTER SET utf8 COLLATE utf8_bin" 1>/dev/null
-        # better solution?
-        mysql_query "GRANT ALL PRIVILEGES ON $DB_SERVER_DBNAME. * TO '${DB_SERVER_ZBX_USER}'@'%'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database COLLATE!"
-    fi
-}
-
-create_db_database_postgresql() {
-    DB_EXISTS=$(psql_query "SELECT 1 AS result FROM pg_database WHERE datname='${DB_SERVER_DBNAME}'")
-
-    if [ -z ${DB_EXISTS} ]; then
-        echo "** Database '${DB_SERVER_DBNAME}' does not exist. Creating..."
-        psql_query "CREATE DATABASE ${DB_SERVER_DBNAME} WITH OWNER ${DB_SERVER_ZBX_USER} ENCODING='UTF8' LC_CTYPE='en_US.utf8' LC_COLLATE='en_US.utf8'" 1>/dev/null
-    else
-        echo "** Database '${DB_SERVER_DBNAME}' already exists. Please be careful with database owner!"
-    fi
-
-    psql_query "CREATE SCHEMA IF NOT EXISTS ${DB_SERVER_SCHEMA}"
-}
-
-create_db_schema_mysql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(mysql_query "SELECT 1 FROM information_schema.tables WHERE table_schema='${DB_SERVER_DBNAME}' and table_name = 'dbversion'")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(mysql_query "SELECT mandatory FROM ${DB_SERVER_DBNAME}.dbversion")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in MySQL"
-
-        zcat /usr/share/doc/zabbix-$type-mysql/create.sql.gz | mysql --silent --skip-column-names \
-                    -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
-                    -u ${DB_SERVER_ROOT_USER} --password="${DB_SERVER_ROOT_PASS}"  \
-                    ${DB_SERVER_DBNAME} 1>/dev/null
-    fi
-}
-
-create_db_schema_postgresql() {
-    local type=$1
-
-    DBVERSION_TABLE_EXISTS=$(psql_query "SELECT 1 FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n ON n.oid = 
-                                         c.relnamespace WHERE  n.nspname = '$DB_SERVER_SCHEMA' AND c.relname = 'dbversion'" "${DB_SERVER_DBNAME}")
-
-    if [ -n "${DBVERSION_TABLE_EXISTS}" ]; then
-        echo "** Table '${DB_SERVER_DBNAME}.dbversion' already exists."
-        ZBX_DB_VERSION=$(psql_query "SELECT mandatory FROM ${DB_SERVER_SCHEMA}.dbversion" "${DB_SERVER_DBNAME}")
-    fi
-
-    if [ -z "${ZBX_DB_VERSION}" ]; then
-        echo "** Creating '${DB_SERVER_DBNAME}' schema in PostgreSQL"
-
-        if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then
-            psql_query "CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;"
-        fi
-
-        if [ -n "${DB_SERVER_ZBX_PASS}" ]; then
-            export PGPASSWORD="${DB_SERVER_ZBX_PASS}"
-        fi
-
-        if [ -n "${DB_SERVER_SCHEMA}" ]; then
-            PGOPTIONS="--search_path=${DB_SERVER_SCHEMA}"
-            export PGOPTIONS
-        fi
-
-        zcat /usr/share/doc/zabbix-$type-postgresql/create.sql.gz | psql -q \
-                -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-                -U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null
-
-        if [ "${ENABLE_TIMESCALEDB}" == "true" ]; then
-            cat /usr/share/doc/zabbix-$type-postgresql/timescaledb.sql | psql -q \
-                -h ${DB_SERVER_HOST} -p ${DB_SERVER_PORT} \
-                -U ${DB_SERVER_ZBX_USER} ${DB_SERVER_DBNAME} 1>/dev/null
-        fi
-
-        unset PGPASSWORD
-        unset PGOPTIONS
-    fi
-}
-
-prepare_web_server_apache() {
-    if [ -d "/etc/apache2/sites-available" ]; then
-        APACHE_SITES_DIR=/etc/apache2/sites-available
-    elif [ -d "/etc/apache2/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/apache2/conf.d
-    elif [ -d "/etc/httpd/conf.d" ]; then
-        APACHE_SITES_DIR=/etc/httpd/conf.d
-    else
-        echo "**** Apache is not available"
-        exit 1
-    fi
-
-    if [ -f "/usr/sbin/a2dissite" ]; then
-        echo "** Disable default site"
-        /usr/sbin/a2dissite 000-default 1>/dev/null
-        rm -rf "$APACHE_SITES_DIR/*"
-    elif [ -f "/etc/apache2/conf.d/default.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/apache2/conf.d/default.conf"
-    elif [ -f "/etc/httpd/conf.d/welcome.conf" ]; then
-        echo "** Disable default site"
-        rm -f "/etc/httpd/conf.d/welcome.conf"
-        rm -f "/etc/httpd/conf.d/ssl.conf"
-    fi
-
-    echo "** Adding Zabbix virtual host (HTTP)"
-    if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then
-        ln -s "$ZABBIX_ETC_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf"
-        if [ -f "/usr/sbin/a2dissite" ]; then
-            /usr/sbin/a2ensite zabbix.conf 1>/dev/null
-        fi
-    else
-        echo "**** Impossible to enable HTTP virtual host"
-    fi
-
-    if [ -f "/etc/apache2/conf.d/ssl.conf" ]; then
-        rm -f "/etc/apache2/conf.d/ssl.conf"
-    fi
-
-    if [ -f "/etc/ssl/apache2/ssl.crt" ] && [ -f "/etc/ssl/apache2/ssl.key" ]; then
-        echo "** Enable SSL support for Apache2"
-        if [ -f "/usr/sbin/a2enmod" ]; then
-            /usr/sbin/a2enmod ssl 1>/dev/null
-        fi
-
-        echo "** Adding Zabbix virtual host (HTTPS)"
-        if [ -f "$ZABBIX_ETC_DIR/apache_ssl.conf" ]; then
-            ln -s "$ZABBIX_ETC_DIR/apache_ssl.conf" "$APACHE_SITES_DIR/zabbix_ssl.conf"
-            if [ -f "/usr/sbin/a2dissite" ]; then
-                /usr/sbin/a2ensite zabbix_ssl.conf 1>/dev/null
-            fi
-        else
-            echo "**** Impossible to enable HTTPS virtual host"
-        fi
-    else
-        echo "**** Impossible to enable SSL support for Apache2. Certificates are missed."
-    fi
-
-    # Change Apache2 logging to stdout and stderr
-    if [ -f "/etc/apache2/apache2.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/apache2.conf"
-    fi
-
-    if [ -f "/etc/httpd/conf/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/httpd/conf/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/httpd.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/httpd.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf-available/other-vhosts-access-log.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-            -e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-            "/etc/apache2/conf-available/other-vhosts-access-log.conf"
-    fi
-
-    if [ -f "/etc/apache2/conf.d/mpm.conf" ]; then
-        sed -ri \
-            -e 's!^(\s*PidFile)\s+\S+!\1 "/var/run/httpd.pid"!g' \
-            "/etc/apache2/conf.d/mpm.conf"
-    fi
-
-    if [ -f "/var/run/apache2/apache2.pid" ]; then
-        rm -f "/var/run/apache2/apache2.pid"
-    fi
-
-    if [ -f "/var/run/httpd/httpd.pid" ]; then
-        rm -f "/var/run/httpd/httpd.pid"
-    fi
-}
-
-prepare_web_server_nginx() {
     NGINX_CONFD_DIR="/etc/nginx/conf.d"
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
-    PHP_SESSIONS_DIR="/var/lib/php5"
 
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
@@ -656,240 +230,14 @@ prepare_web_server_nginx() {
         echo "**** Impossible to enable SSL support for Nginx. Certificates are missed."
     fi
 
-    if [ -d "/var/log/nginx/" ]; then
     ln -sf /dev/fd/2 /var/log/nginx/error.log
-    fi
-
-    ln -sf /dev/fd/2 /var/log/php5-fpm.log
-    ln -sf /dev/fd/2 /var/log/php7.2-fpm.log
-}
-
-stop_databases() {
-    if ([ "${ZBX_MAIN_DB}" == "mysql" ] || [ "${ZBX_PROXY_DB}" == "mysql" ]) && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        mysql_query "DELETE FROM mysql.user WHERE host = 'localhost' AND user != 'root'" 1>/dev/null
-
-        if [ -f "/var/lib/mysql/mysqld.pid" ]; then
-            kill -TERM $(cat /var/lib/mysql/mysqld.pid)
-        elif [ -f "/var/run/mysqld/mysqld.pid" ]; then
-            kill -TERM $(cat /var/run/mysqld/mysqld.pid)
-        fi
-    fi
-
-    if [ "${ZBX_MAIN_DB}" == "postgresql" ] && [ "${DB_SERVER_HOST}" == "localhost" ]; then
-        if [ "${OS_CODENAME}" == "alpine" ]; then
-            PGDATA=/var/lib/postgresql
-            BINDIR=/usr/bin
-        else
-            PGDATA=/var/lib/postgresql/9.3/main
-            BINDIR=/usr/lib/postgresql/9.3/bin
-        fi
-        su -c "$BINDIR/pg_ctl -D \"$PGDATA\" -m fast -w stop --silent" postgres 1>/dev/null 2>/dev/null
-    fi
 }
 
 clear_deploy() {
-    local type=$1
     echo "** Cleaning the system"
-
-    [ "$type" != "appliance" ] && return
-
-    stop_databases
 }
 
-update_zbx_config() {
-    local type=$1
-    local db_type=$2
-
-    echo "** Preparing Zabbix $type configuration file"
-
-    ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_$type.conf
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyMode" "${ZBX_PROXYMODE}"
-        update_config_var $ZBX_CONFIG "Server" "${ZBX_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "ServerPort" "${ZBX_SERVER_PORT}"
-        if [ -z "${ZBX_HOSTNAME}" ] && [ -n "${ZBX_HOSTNAMEITEM}" ]; then
-            update_config_var $ZBX_CONFIG "Hostname" ""
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        else
-            update_config_var $ZBX_CONFIG "Hostname" "${ZBX_HOSTNAME:-"zabbix-proxy-"$db_type}"
-            update_config_var $ZBX_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-        fi
-    fi
-
-    if [ $type == "proxy" ] && [ "${ZBX_ADD_SERVER}" = "true" ]; then
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_PROXY_LISTENPORT:-"10061"}"
-    else
-        update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SourceIP" "${ZBX_SOURCEIP}"
-    update_config_var $ZBX_CONFIG "LogType" "console"
-    update_config_var $ZBX_CONFIG "LogFile"
-    update_config_var $ZBX_CONFIG "LogFileSize"
-    update_config_var $ZBX_CONFIG "PidFile"
-
-    update_config_var $ZBX_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
-
-    if [ $type == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
-        update_config_var $ZBX_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
-    fi
-
-    if [ "$db_type" == "sqlite3" ]; then
-        update_config_var $ZBX_CONFIG "DBHost"
-        update_config_var $ZBX_CONFIG "DBName" "/var/lib/zabbix/zabbix_proxy_db"
-        update_config_var $ZBX_CONFIG "DBUser"
-        update_config_var $ZBX_CONFIG "DBPort"
-        update_config_var $ZBX_CONFIG "DBPassword"
-    else
-        update_config_var $ZBX_CONFIG "DBHost" "${DB_SERVER_HOST}"
-        update_config_var $ZBX_CONFIG "DBName" "${DB_SERVER_DBNAME}"
-        update_config_var $ZBX_CONFIG "DBSchema" "${DB_SERVER_SCHEMA}"
-        update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
-        update_config_var $ZBX_CONFIG "DBPort" "${DB_SERVER_PORT}"
-        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
-    fi
-
-    if [ $type == "server" ]; then
-        update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
-        update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
-    fi
-
-    update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "ProxyLocalBuffer" "${ZBX_PROXYLOCALBUFFER}"
-        update_config_var $ZBX_CONFIG "ProxyOfflineBuffer" "${ZBX_PROXYOFFLINEBUFFER}"
-        update_config_var $ZBX_CONFIG "HeartbeatFrequency" "${ZBX_PROXYHEARTBEATFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ConfigFrequency" "${ZBX_CONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "DataSenderFrequency" "${ZBX_DATASENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StatsAllowedIP" "${ZBX_STATSALLOWEDIP}"
-
-    update_config_var $ZBX_CONFIG "StartPollers" "${ZBX_STARTPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartIPMIPollers" "${ZBX_IPMIPOLLERS}"
-    update_config_var $ZBX_CONFIG "StartPollersUnreachable" "${ZBX_STARTPOLLERSUNREACHABLE}"
-    update_config_var $ZBX_CONFIG "StartTrappers" "${ZBX_STARTTRAPPERS}"
-    update_config_var $ZBX_CONFIG "StartPingers" "${ZBX_STARTPINGERS}"
-    update_config_var $ZBX_CONFIG "StartDiscoverers" "${ZBX_STARTDISCOVERERS}"
-    update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "StartPreprocessors" "${ZBX_STARTPREPROCESSORS}"
-        update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
-        update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
-        update_config_var $ZBX_CONFIG "StartAlerters" "${ZBX_STARTALERTERS}"
-    fi
-
-    ZBX_JAVAGATEWAY_ENABLE=${ZBX_JAVAGATEWAY_ENABLE:-"false"}
-    if [ "${ZBX_JAVAGATEWAY_ENABLE}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "JavaGateway" "${ZBX_JAVAGATEWAY:-"zabbix-java-gateway"}"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort" "${ZBX_JAVAGATEWAYPORT}"
-        update_config_var $ZBX_CONFIG "StartJavaPollers" "${ZBX_STARTJAVAPOLLERS:-"5"}"
-    else
-        update_config_var $ZBX_CONFIG "JavaGateway"
-        update_config_var $ZBX_CONFIG "JavaGatewayPort"
-        update_config_var $ZBX_CONFIG "StartJavaPollers"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartVMwareCollectors" "${ZBX_STARTVMWARECOLLECTORS}"
-    update_config_var $ZBX_CONFIG "VMwareFrequency" "${ZBX_VMWAREFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwarePerfFrequency" "${ZBX_VMWAREPERFFREQUENCY}"
-    update_config_var $ZBX_CONFIG "VMwareCacheSize" "${ZBX_VMWARECACHESIZE}"
-    update_config_var $ZBX_CONFIG "VMwareTimeout" "${ZBX_VMWARETIMEOUT}"
-
-    ZBX_ENABLE_SNMP_TRAPS=${ZBX_ENABLE_SNMP_TRAPS:-"false"}
-    if [ "${ZBX_ENABLE_SNMP_TRAPS}" == "true" ]; then
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile" "${ZABBIX_USER_HOME_DIR}/snmptraps/snmptraps.log"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper" "1"
-    else
-        update_config_var $ZBX_CONFIG "SNMPTrapperFile"
-        update_config_var $ZBX_CONFIG "StartSNMPTrapper"
-    fi
-
-    update_config_var $ZBX_CONFIG "HousekeepingFrequency" "${ZBX_HOUSEKEEPINGFREQUENCY}"
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
-        update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
-
-    if [ "$type" == "server" ]; then
-        update_config_var $ZBX_CONFIG "CacheUpdateFrequency" "${ZBX_CACHEUPDATEFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "StartDBSyncers" "${ZBX_STARTDBSYNCERS}"
-    update_config_var $ZBX_CONFIG "HistoryCacheSize" "${ZBX_HISTORYCACHESIZE}"
-    update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
-        update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
-    fi
-
-    update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
-    update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERIMEOUT}"
-    update_config_var $ZBX_CONFIG "UnreachablePeriod" "${ZBX_UNREACHABLEPERIOD}"
-    update_config_var $ZBX_CONFIG "UnavailableDelay" "${ZBX_UNAVAILABLEDELAY}"
-    update_config_var $ZBX_CONFIG "UnreachableDelay" "${ZBX_UNREACHABLEDELAY}"
-
-    update_config_var $ZBX_CONFIG "AlertScriptsPath" "/usr/lib/zabbix/alertscripts"
-    update_config_var $ZBX_CONFIG "ExternalScripts" "/usr/lib/zabbix/externalscripts"
-
-    # Possible few fping locations
-    if [ -f "/usr/bin/fping" ]; then
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
-    else
-        update_config_var $ZBX_CONFIG "FpingLocation" "/usr/sbin/fping"
-    fi
-    if [ -f "/usr/bin/fping6" ]; then
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
-    else
-        update_config_var $ZBX_CONFIG "Fping6Location" "/usr/sbin/fping6"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
-    update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
-
-    if [ "$type" == "server" ]; then 
-        update_config_var $ZBX_CONFIG "StartProxyPollers" "${ZBX_STARTPROXYPOLLERS}"
-        update_config_var $ZBX_CONFIG "ProxyConfigFrequency" "${ZBX_PROXYCONFIGFREQUENCY}"
-        update_config_var $ZBX_CONFIG "ProxyDataFrequency" "${ZBX_PROXYDATAFREQUENCY}"
-    fi
-
-    update_config_var $ZBX_CONFIG "SSLCertLocation" "$ZABBIX_USER_HOME_DIR/ssl/certs/"
-    update_config_var $ZBX_CONFIG "SSLKeyLocation" "$ZABBIX_USER_HOME_DIR/ssl/keys/"
-    update_config_var $ZBX_CONFIG "SSLCALocation" "$ZABBIX_USER_HOME_DIR/ssl/ssl_ca/"
-    update_config_var $ZBX_CONFIG "LoadModulePath" "$ZABBIX_USER_HOME_DIR/modules/"
-    update_config_multiple_var $ZBX_CONFIG "LoadModule" "${ZBX_LOADMODULE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSConnect" "${ZBX_TLSCONNECT}"
-        update_config_var $ZBX_CONFIG "TLSAccept" "${ZBX_TLSACCEPT}"
-    fi
-    update_config_var $ZBX_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
-    update_config_var $ZBX_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSServerCertIssuer" "${ZBX_TLSSERVERCERTISSUER}"
-        update_config_var $ZBX_CONFIG "TLSServerCertSubject" "${ZBX_TLSSERVERCERTSUBJECT}"
-    fi
-
-    update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
-    update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
-
-    if [ "$type" == "proxy" ]; then
-        update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
-        update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
-    fi
-}
-
-
 prepare_zbx_web_config() {
-    local db_type=$1
     local server_name=""
 
     echo "** Preparing Zabbix frontend configuration file"
@@ -903,37 +251,14 @@ prepare_zbx_web_config() {
 
     ln -s "$ZBX_WEB_CONFIG" "$ZBX_WWW_ROOT/conf/zabbix.conf.php"
 
-    # Different places of PHP configuration file
-    if [ -f "/etc/php5/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php5/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php5/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/apache2/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.0/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php.d/99-zabbix.ini" ]; then
     PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
-    elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/fpm/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/fpm/conf.d/99-zabbix.ini"
-    elif [ -f "/etc/php/7.2/apache2/conf.d/99-zabbix.ini" ]; then
-        PHP_CONFIG_FILE="/etc/php/7.2/apache2/conf.d/99-zabbix.ini"
-    fi
 
-    if [ -n "$PHP_CONFIG_FILE" ]; then
     update_config_var "$PHP_CONFIG_FILE" "max_execution_time" "${ZBX_MAXEXECUTIONTIME:-"600"}"
     update_config_var "$PHP_CONFIG_FILE" "memory_limit" "${ZBX_MEMORYLIMIT:-"128M"}"
     update_config_var "$PHP_CONFIG_FILE" "post_max_size" "${ZBX_POSTMAXSIZE:-"16M"}"
     update_config_var "$PHP_CONFIG_FILE" "upload_max_filesize" "${ZBX_UPLOADMAXFILESIZE:-"2M"}"
     update_config_var "$PHP_CONFIG_FILE" "max_input_time" "${ZBX_MAXINPUTTIME:-"300"}"
     update_config_var "$PHP_CONFIG_FILE" "date.timezone" "${PHP_TZ}"
-    else
-        echo "**** Zabbix related PHP configuration file not found"
-    fi
 
     ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
 
@@ -958,221 +283,34 @@ prepare_zbx_web_config() {
         -e "s/{ZBX_HISTORYSTORAGETYPES}/$history_storage_types/g" \
     "$ZBX_WEB_CONFIG"
 
-    [ "$db_type" = "postgresql" ] && sed -i "s/MYSQL/POSTGRESQL/g" "$ZBX_WEB_CONFIG"
-
     [ -n "${ZBX_SESSION_NAME}" ] && sed -i "/ZBX_SESSION_NAME/s/'[^']*'/'${ZBX_SESSION_NAME}'/2" "$ZBX_WWW_ROOT/include/defines.inc.php"
 }
 
-prepare_zbx_agent_config() {
-    echo "** Preparing Zabbix agent configuration file"
-
-    ZBX_AGENT_CONFIG=$ZABBIX_ETC_DIR/zabbix_agentd.conf
-
-    ZBX_PASSIVESERVERS=${ZBX_PASSIVESERVERS:-""}
-    ZBX_ACTIVESERVERS=${ZBX_ACTIVESERVERS:-""}
-
-    [ -n "$ZBX_PASSIVESERVERS" ] && ZBX_PASSIVESERVERS=","$ZBX_PASSIVESERVERS
-
-    ZBX_PASSIVESERVERS=$ZBX_SERVER_HOST$ZBX_PASSIVESERVERS
-
-    [ -n "$ZBX_ACTIVESERVERS" ] && ZBX_ACTIVESERVERS=","$ZBX_ACTIVESERVERS
-
-    ZBX_ACTIVESERVERS=$ZBX_SERVER_HOST":"$ZBX_SERVER_PORT$ZBX_ACTIVESERVERS
-
-    update_config_var $ZBX_AGENT_CONFIG "PidFile"
-    update_config_var $ZBX_AGENT_CONFIG "LogType" "console"
-    update_config_var $ZBX_AGENT_CONFIG "LogFile"
-    update_config_var $ZBX_AGENT_CONFIG "LogFileSize"
-    update_config_var $ZBX_AGENT_CONFIG "DebugLevel" "${ZBX_DEBUGLEVEL}"
-    update_config_var $ZBX_AGENT_CONFIG "SourceIP"
-    update_config_var $ZBX_AGENT_CONFIG "EnableRemoteCommands" "${ZBX_ENABLEREMOTECOMMANDS}"
-    update_config_var $ZBX_AGENT_CONFIG "LogRemoteCommands" "${ZBX_LOGREMOTECOMMANDS}"
-
-    ZBX_PASSIVE_ALLOW=${ZBX_PASSIVE_ALLOW:-"true"}
-    if [ "$ZBX_PASSIVE_ALLOW" == "true" ]; then
-        echo "** Using '$ZBX_PASSIVESERVERS' servers for passive checks"
-        update_config_var $ZBX_AGENT_CONFIG "Server" "${ZBX_PASSIVESERVERS}"
-    else
-        update_config_var $ZBX_AGENT_CONFIG "Server"
-    fi
-
-    update_config_var $ZBX_AGENT_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
-    update_config_var $ZBX_AGENT_CONFIG "ListenIP" "${ZBX_LISTENIP}"
-    update_config_var $ZBX_AGENT_CONFIG "StartAgents" "${ZBX_STARTAGENTS}"
-
-    ZBX_ACTIVE_ALLOW=${ZBX_ACTIVE_ALLOW:-"true"}
-    if [ "$ZBX_ACTIVE_ALLOW" == "true" ]; then
-        echo "** Using '$ZBX_ACTIVESERVERS' servers for active checks"
-        update_config_var $ZBX_AGENT_CONFIG "ServerActive" "${ZBX_ACTIVESERVERS}"
-    else
-        update_config_var $ZBX_AGENT_CONFIG "ServerActive"
-    fi
-
-    update_config_var $ZBX_AGENT_CONFIG "Hostname" "${ZBX_HOSTNAME}"
-    update_config_var $ZBX_AGENT_CONFIG "HostnameItem" "${ZBX_HOSTNAMEITEM}"
-    update_config_var $ZBX_AGENT_CONFIG "HostMetadata" "${ZBX_METADATA}"
-    update_config_var $ZBX_AGENT_CONFIG "HostMetadataItem" "${ZBX_METADATAITEM}"
-    update_config_var $ZBX_AGENT_CONFIG "RefreshActiveChecks" "${ZBX_REFRESHACTIVECHECKS}"
-    update_config_var $ZBX_AGENT_CONFIG "BufferSend" "${ZBX_BUFFERSEND}"
-    update_config_var $ZBX_AGENT_CONFIG "BufferSize" "${ZBX_BUFFERSIZE}"
-    update_config_var $ZBX_AGENT_CONFIG "MaxLinesPerSecond" "${ZBX_MAXLINESPERSECOND}"
-    # Please use include to enable Alias feature
-#    update_config_multiple_var $ZBX_AGENT_CONFIG "Alias" ${ZBX_ALIAS}
-    update_config_var $ZBX_AGENT_CONFIG "Timeout" "${ZBX_TIMEOUT}"
-    update_config_var $ZBX_AGENT_CONFIG "Include" "/etc/zabbix/zabbix_agentd.d/"
-    update_config_var $ZBX_AGENT_CONFIG "UnsafeUserParameters" "${ZBX_UNSAFEUSERPARAMETERS}"
-    update_config_var $ZBX_AGENT_CONFIG "LoadModulePath" "$ZABBIX_USER_HOME_DIR/modules/"
-    update_config_multiple_var $ZBX_AGENT_CONFIG "LoadModule" "${ZBX_LOADMODULE}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSConnect" "${ZBX_TLSCONNECT}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSAccept" "${ZBX_TLSACCEPT}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSServerCertIssuer" "${ZBX_TLSSERVERCERTISSUER}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSServerCertSubject" "${ZBX_TLSSERVERCERTSUBJECT}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
-    update_config_var $ZBX_AGENT_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
-}
-
-prepare_java_gateway_config() {
-    echo "** Preparing Zabbix Java Gateway log configuration file"
-
-    ZBX_GATEWAY_CONFIG=$ZABBIX_ETC_DIR/zabbix_java_gateway_logback.xml
-
-    if [ -n "${ZBX_DEBUGLEVEL}" ]; then
-        echo "Updating $ZBX_GATEWAY_CONFIG 'DebugLevel' parameter: '${ZBX_DEBUGLEVEL}'... updated"
-        if [ -f "$ZBX_GATEWAY_CONFIG" ]; then
-            sed -i -e "/^.*<root level=/s/=.*/=\"${ZBX_DEBUGLEVEL}\">/" "$ZBX_GATEWAY_CONFIG"
-        else
-            echo "**** Zabbix Java Gateway log configuration file '$ZBX_GATEWAY_CONFIG' not found"
-        fi
-    fi
-}
-
-prepare_agent() {
-    echo "** Preparing Zabbix agent"
-    prepare_zbx_agent_config
-}
-
-prepare_server() {
-    local db_type=$1
-
-    echo "** Preparing Zabbix server"
-
-    check_variables_$db_type "server"
-    check_db_connect_$db_type
-    create_db_user_$db_type
-    create_db_database_$db_type
-    create_db_schema_$db_type "server"
-
-    update_zbx_config "server" "$db_type"
-}
-
-prepare_proxy() {
-    local db_type=$1
-
-    echo "Preparing Zabbix proxy"
-
-    if [ "$db_type" != "sqlite3" ]; then
-        check_variables_$db_type "proxy"
-        check_db_connect_$db_type
-        create_db_user_$db_type
-        create_db_database_$db_type
-        create_db_schema_$db_type "proxy"
-    fi
-
-    update_zbx_config "proxy" $db_type
-}
-
 prepare_web() {
-    local web_server=$1
-    local db_type=$2
-
     echo "** Preparing Zabbix web-interface"
 
-    check_variables_$db_type
+    check_variables
-    check_db_connect_$db_type
+    check_db_connect
-    prepare_web_server_$web_server
+    prepare_web_server
-    prepare_zbx_web_config $db_type
+    prepare_zbx_web_config
 }
 
-prepare_java_gateway() {
-    echo "** Preparing Zabbix Java Gateway"
-
-    prepare_java_gateway_config
-}
 
 #################################################
 
-if [ ! -n "$zbx_type" ]; then
+echo "** Deploying Zabbix web-interface (Nginx) with MySQL database"
-    echo "**** Type of Zabbix component is not specified"
-    exit 1
-elif [ "$zbx_type" == "dev" ]; then
-    echo "** Deploying Zabbix installation from SVN"
-else
-    if [ ! -n "$zbx_db_type" ]; then
-        echo "**** Database type of Zabbix $zbx_type is not specified"
-        exit 1
-    fi
 
-    if [ "$zbx_db_type" != "none" ]; then
+prepare_system
-        if [ "$zbx_opt_type" != "none" ]; then
-            echo "** Deploying Zabbix $zbx_type ($zbx_opt_type) with $zbx_db_type database"
-        else
-            echo "** Deploying Zabbix $zbx_type with $zbx_db_type database"
-        fi
-    else
-        echo "** Deploying Zabbix $zbx_type"
-    fi
-fi
 
-prepare_system "$zbx_type" "$zbx_opt_type"
+prepare_web
 
-[ "$zbx_type" == "server" ] && prepare_server $zbx_db_type
+clear_deploy
-[ "${ZBX_ADD_SERVER}" == "true" ] && prepare_server ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "proxy" ] && prepare_proxy $zbx_db_type
-[ "${ZBX_ADD_PROXY}" == "true" ] && prepare_proxy ${ZBX_PROXY_DB}
-
-[ "$zbx_type" == "frontend" ] && prepare_web $zbx_opt_type $zbx_db_type
-[ "${ZBX_ADD_WEB}" == "true" ] && prepare_web ${ZBX_WEB_SERVER} ${ZBX_MAIN_DB}
-
-[ "$zbx_type" == "agent" ] && prepare_agent
-[ "${ZBX_ADD_AGENT}" == "true" ] && prepare_agent
-
-[ "$zbx_type" == "java-gateway" ] && prepare_java_gateway
-[ "${ZBX_ADD_JAVA_GATEWAY}" == "true" ] && prepare_java_gateway
-
-clear_deploy "$zbx_type"
 
 echo "########################################################"
 
 if [ "$1" != "" ]; then
     echo "** Executing '$@'"
     exec "$@"
-elif [ "$zbx_type" == "agent" ]; then
-    echo "** Starting Zabbix agent"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_agentd --foreground -c /etc/zabbix/zabbix_agentd.conf"
-elif [ "$zbx_type" == "proxy" ]; then
-    echo "** Starting Zabbix proxy"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_proxy --foreground -c /etc/zabbix/zabbix_proxy.conf"
-elif [ "$zbx_type" == "server" ]; then
-    echo "** Starting Zabbix server"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_server --foreground -c /etc/zabbix/zabbix_server.conf"
-elif [ "$zbx_type" == "java-gateway" ]; then
-    echo "** Starting Zabbix Java Gateway"
-    exec su zabbix -s "/bin/bash" -c "/usr/sbin/zabbix_java_gateway"
-elif [ "$zbx_type" == "frontend" ] && [ "$zbx_opt_type" == "apache" ]; then
-    echo "** Starting Zabbix frontend"
-    if [ -f "/usr/sbin/httpd" ]; then
-        exec /usr/sbin/httpd -D FOREGROUND
-    elif [ -f "/usr/sbin/apache2ctl" ]; then
-        exec /bin/bash -c "source /etc/apache2/envvars && /usr/sbin/apache2ctl -D FOREGROUND"
-    else
-        echo "Unknown Web-server. Exiting..."
-        exit 1
-    fi
 elif [ -f "/usr/bin/supervisord" ]; then
     echo "** Executing supervisord"
     exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf

web-nginx-mysql/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-nginx-pgsql/alpine/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-nginx-pgsql/centos/Dockerfile

@@ -1,73 +1,26 @@
-FROM centos:centos7 as builder
-
-ARG YUM_FLAGS_COMMON="-y"
-ARG YUM_FLAGS_DEV="${YUM_FLAGS_COMMON}"
-
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
-
-RUN set -eux && \
-    yum --quiet makecache && \
-    yum ${YUM_FLAGS_DEV} install \
-            gettext \
-            git && \
-    cd /tmp/ && \
-    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /tmp/zabbix/ && \
-    cp -R /tmp/zabbix-${ZBX_VERSION}/frontends/php/* /tmp/zabbix/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    cd /tmp/zabbix/ && \
-    rm -f conf/zabbix.conf.php && \
-    rm -rf tests && \
-    ./locale/make_mo.sh
-
 FROM centos:centos7
-LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"
 
-ARG BUILD_DATE
+LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \
-ARG VCS_REF
+      org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
-
+      org.opencontainers.image.vendor="Zabbix LLC" \
-ARG YUM_FLAGS_COMMON="-y"
+      org.opencontainers.image.url="https://zabbix.com/" \
-ARG YUM_FLAGS_PERSISTENT="${YUM_FLAGS_COMMON}"
+      org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \
-
+      org.opencontainers.image.licenses="GPL v2.0"
-ARG MAJOR_VERSION=5.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=nginx
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-centos" \
-      org.label-schema.vendor="Zabbix LLC" \
-      org.label-schema.url="https://zabbix.com/" \
-      org.label-schema.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \
-      org.label-schema.vcs-ref="${VCS_REF}" \
-      org.label-schema.build-date="${BUILD_DATE}" \
-      org.label-schema.schema-version="1.0" \
-      org.label-schema.license="GPL v2.0" \
-      org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      org.label-schema.version="${ZBX_VERSION}" \
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
-      org.label-schema.docker.cmd="docker run --name zabbix-web-${ZBX_OPT_TYPE}-pgsql --link postgres-server:postgres --link zabbix-server:zabbix-server -p 80:80 -d zabbix-web-${ZBX_OPT_TYPE}-pgsql:centos-${ZBX_VERSION}"
 
 STOPSIGNAL SIGTERM
 
-COPY --from=builder /tmp/zabbix/ /usr/share/zabbix/
-
 RUN set -eux && \
-    groupadd --system zabbix && \
+    groupadd -g 1995 --system zabbix && \
     adduser -r --shell /sbin/nologin \
-            -g zabbix \
+            -g zabbix -G root \
-            -d /var/lib/zabbix/ \
+            -d /var/lib/zabbix/ -u 1997 \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
+    yum --quiet makecache && \
-    yum ${YUM_FLAGS_COMMON} makecache && \
+    yum -y install epel-release && \
-    yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
+    yum -y install --setopt=tsflags=nodocs \
-    yum ${YUM_FLAGS_PERSISTENT} install supervisor \
+            supervisor \
             curl \
             nginx \
             postgresql \
@@ -79,29 +32,60 @@ RUN set -eux && \
             php-pgsql \
             php-xml && \
     rm -f /etc/nginx/conf.d/*.conf  && \
+    rm -f /etc/php-fpm.d/www.conf && \
+    yum -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
+
+ARG MAJOR_VERSION=5.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
+
+COPY ["conf/etc/", "/etc/"]
+
+RUN set -eux && \
+    yum --quiet makecache && \
+    yum -y install --setopt=tsflags=nodocs \
+            gettext \
+            git && \
+    cd /usr/share/ && \
+    git clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
+    mkdir /usr/share/zabbix/ && \
+    cp -R /usr/share/zabbix-${ZBX_VERSION}/frontends/php/* /usr/share/zabbix/ && \
+    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
+    cd /usr/share/zabbix/ && \
+    rm -f conf/zabbix.conf.php && \
+    rm -rf tests && \
+    ./locale/make_mo.sh && \
+    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
                 cut -d"'" -f 2 | sort | \
                 xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
-    rm -f /etc/php-fpm.d/www.conf && \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    mkdir -p /var/lib/php/ && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    chown --quiet -R nginx:nginx /var/lib/php/ && \
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
-    chown --quiet -R nginx:nginx /usr/share/zabbix && \
+    chown --quiet -R zabbix:root /etc/nginx/ /etc/php.d/ /etc/php.ini && \
-    yum ${YUM_FLAGS_PERSISTENT} clean all && \
+    chgrp -R 0 /etc/nginx/ /etc/php.d/ /etc/php.ini && \
-    rm -rf /var/cache/yum/
+    chmod -R g=u /etc/nginx/ /etc/php.d/ /etc/php.ini && \
+    yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \
+    yum -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
 
-EXPOSE 80/TCP 443/TCP
+EXPOSE 8080/TCP 8443/TCP
 
 WORKDIR /usr/share/zabbix
 
 VOLUME ["/etc/ssl/nginx"]
 
-COPY ["conf/etc/supervisor/", "/etc/supervisor/"]
-COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/nginx_ssl.conf", "/etc/zabbix/"]
-COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
-COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"]
-COPY ["conf/etc/php-fpm.conf", "/etc/php-fpm.conf"]
-COPY ["conf/etc/php.d/99-zabbix.ini", "/etc/php.d/99-zabbix.ini"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
+USER 1997
+
 ENTRYPOINT ["docker-entrypoint.sh"]

web-nginx-pgsql/centos/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

web-nginx-pgsql/centos/conf/etc/nginx/nginx.conf

@@ -1,10 +1,10 @@
-user nginx;
+#user nginx;
 worker_processes 5;
 worker_rlimit_nofile 256000;
 
 error_log /dev/fd/2 warn;
 
-pid        /var/run/nginx.pid;
+pid        /tmp/nginx.pid;
 
 events {
     worker_connections 5120;

web-nginx-pgsql/centos/conf/etc/php-fpm.conf

@@ -12,7 +12,6 @@
 ; Relative path can also be used. They will be prefixed by:
 ;  - the global prefix if it's been set (-p argument)
 ;  - /usr otherwise
-include = /etc/php-fpm.d/*.conf
 
 ;;;;;;;;;;;;;;;;;;
 ; Global Options ;
@@ -29,7 +28,7 @@ include = /etc/php-fpm.d/*.conf
 ; in a local file.
 ; Note: the default prefix is /var
 ; Default Value: log/php-fpm.log
-error_log = /var/log/php-fpm.log
+error_log = /dev/fd/2
 
 ; syslog_facility is used to specify what type of program is logging the
 ; message. This lets syslogd specify that messages from different facilities
@@ -146,8 +145,8 @@ error_log = /var/log/php-fpm.log
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-user = nginx
+;user = nginx
-group = nginx
+;group = nginx
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are:
@@ -161,7 +160,7 @@ group = nginx
 ;                            (IPv6 and IPv4-mapped) on a specific port;
 ;   '/path/to/unix/socket' - to listen on a unix socket.
 ; Note: This value is mandatory.
-listen = /var/run/php5-fpm.sock
+listen = /tmp/php-fpm.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
@@ -172,8 +171,8 @@ listen = /var/run/php5-fpm.sock
 ; BSD-derived systems allow connections regardless of permissions. 
 ; Default Values: user and group are set as the running user
 ;                 mode is set to 0660
-listen.owner = nginx
+;listen.owner = nginx
-listen.group = nginx
+;listen.group = nginx
 ;listen.mode = 0660
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.

web-nginx-pgsql/centos/conf/etc/php.d/99-zabbix.ini

@@ -6,4 +6,3 @@ max_input_time=300
 always_populate_raw_post_data=-1
 max_input_vars=10000
 ; date.timezone=Europe/Riga
-session.save_path=/var/lib/php/

web-nginx-pgsql/centos/conf/etc/supervisor/supervisord.conf

@@ -1,17 +1,17 @@
 ; supervisor config file
 
 [unix_http_server]
-file = /var/run/supervisor.sock   ; (the path to the socket file)
+file = /tmp/supervisor.sock        ; (the path to the socket file)
 chmod = 0700                       ; sockef file mode (default 0700)
 username = zbx
 password = password
 
 [supervisord]
 logfile = /dev/stdout                        ; (main log file;default $CWD/supervisord.log)
-pidfile = /var/run/supervisord.pid           ; (supervisord pidfile;default supervisord.pid)
+pidfile = /tmp/supervisord.pid               ; (supervisord pidfile;default supervisord.pid)
 childlogdir = /tmp                           ; ('AUTO' child log dir, default $TEMP)
 critical = critical
-user = root
+;user = zabbix
 logfile_maxbytes = 0
 logfile_backupcount = 0
 loglevel = info
@@ -23,7 +23,7 @@ loglevel = info
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
-serverurl = unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+serverurl = unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or

web-nginx-pgsql/centos/conf/etc/zabbix/nginx.conf

@@ -1,5 +1,5 @@
 server {
-    listen          80;
+    listen          8080;
     server_name     zabbix;
     index           index.php;
 
@@ -51,7 +51,7 @@ server {
     }
 
     location ~ .php$ {
-        fastcgi_pass   unix:/var/run/php5-fpm.sock;
+        fastcgi_pass   unix:/tmp/php-fpm.sock;
         fastcgi_index  index.php;
 
         fastcgi_param  SCRIPT_FILENAME  $webroot$fastcgi_script_name;

web-nginx-pgsql/centos/conf/etc/zabbix/nginx_ssl.conf

@@ -1,5 +1,5 @@
 server {
-    listen          443 ssl http2;
+    listen          8443 ssl http2;
     server_name     zabbix;
     server_name_in_redirect off;
 
@@ -75,7 +75,7 @@ server {
     }
 
     location ~ .php$ {
-        fastcgi_pass   unix:/var/run/php5-fpm.sock;
+        fastcgi_pass   unix:/tmp/php-fpm.sock;
         fastcgi_index  index.php;
 
         fastcgi_param  SCRIPT_FILENAME  $webroot$fastcgi_script_name;

web-nginx-pgsql/centos/conf/etc/zabbix/web/zabbix.conf.php

@@ -2,7 +2,7 @@
 // Zabbix GUI configuration file.
 global $DB, $HISTORY;
 
-$DB['TYPE']     = 'MYSQL';
+$DB['TYPE']     = 'POSTGRESQL';
 $DB['SERVER']   = '{DB_SERVER_HOST}';
 $DB['PORT']     = '{DB_SERVER_PORT}';
 $DB['DATABASE'] = '{DB_SERVER_DBNAME}';

web-nginx-pgsql/ubuntu/README.md

@@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource
 
 # Zabbix web interface images
 
-These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.9, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
+These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.11, Ubuntu 18.04 (bionic) and CentOS 7 images. The available versions of Zabbix web interface are:
 
     Zabbix web interface 3.0 (tags: alpine-3.0-latest, ubuntu-3.0-latest, centos-3.0-latest)
     Zabbix web interface 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*)

zabbix-appliance/alpine/Dockerfile

@@ -129,8 +129,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-${ZBX_TYPE} \
             --with-${ZBX_DB_TYPE} \
-# Does not support stable iksemel library
-#            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \

zabbix-appliance/centos/Dockerfile

@@ -11,8 +11,6 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
     MYSQL_ALLOW_EMPTY_PASSWORD=true ZBX_ADD_SERVER=true ZBX_ADD_WEB=true DB_SERVER_HOST=localhost MYSQL_USER=zabbix ZBX_ADD_JAVA_GATEWAY=true ZBX_JAVAGATEWAY_ENABLE=true ZBX_JAVAGATEWAY=localhost
 
 RUN set -eux && \
-    yum ${YUM_FLAGS_DEV} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-devel-1.4-2.el7.centos.x86_64.rpm \
-                                 https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm && \
     yum --quiet makecache && \
     yum ${YUM_FLAGS_DEV} install \
             autoconf \
@@ -48,7 +46,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-${ZBX_TYPE} \
             --with-${ZBX_DB_TYPE} \
-            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -139,8 +136,7 @@ RUN set -eux && \
     chown --quiet -R zabbix:root /var/lib/zabbix && \
     mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \
     yum ${YUM_FLAGS_COMMON} makecache && \
-    yum ${YUM_FLAGS_PERSISTENT} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/iksemel-1.4-2.el7.centos.x86_64.rpm \
+    yum ${YUM_FLAGS_PERSISTENT} install https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm  && \
-                                        https://repo.zabbix.com/non-supported/rhel/7/x86_64/fping-3.10-1.el7.x86_64.rpm  && \
     yum ${YUM_FLAGS_PERSISTENT} install epel-release && \
     yum ${YUM_FLAGS_PERSISTENT} install \
             iputils \

zabbix-appliance/rhel/Dockerfile

@@ -54,7 +54,6 @@ COPY ["licenses", "/licenses"]
 RUN INSTALL_PKGS="OpenIPMI-libs \
             curl \
             fping \
-            iksemel \
             java-1.8.0-openjdk-headless \
             libcurl \
             libevent \
@@ -116,7 +115,6 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte
             automake \
             gcc \
             gettext \
-            iksemel-devel \
             java-1.8.0-openjdk-devel \
             libcurl-devel \
             libevent-devel \
@@ -147,7 +145,6 @@ RUN REPOLIST="rhel-7-server-rpms,rhel-7-server-optional-rpms,zabbix-non-supporte
             --enable-agent \
             --enable-${ZBX_TYPE} \
             --with-${ZBX_DB_TYPE} \
-            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \

zabbix-appliance/ubuntu/Dockerfile

@@ -25,7 +25,6 @@ RUN set -eux && \
             libc6-dev \
             libcurl4-openssl-dev \
             libevent-dev \
-            libiksemel-dev \
             libldap2-dev \
             libmysqlclient-dev \
             libopenipmi-dev \
@@ -55,7 +54,6 @@ RUN set -eux && \
             --enable-agent \
             --enable-${ZBX_TYPE} \
             --with-${ZBX_DB_TYPE} \
-            --with-jabber \
             --with-ldap \
             --with-libcurl \
             --with-libxml2 \
@@ -174,7 +172,6 @@ RUN set -eux && \
             fping \
             libcurl4 \
             libevent-2.1 \
-            libiksemel3 \
             libmysqlclient20 \
             libopenipmi0 \
             libpcre3 \