Updated Ubuntu images

agent/alpine/Dockerfile

@@ -89,7 +89,7 @@ EXPOSE 10050/TCP
 
 WORKDIR /var/lib/zabbix
 
-VOLUME ["/var/lib/zabbix/enc"]
+VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules"]
 
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 

agent/ubuntu/Dockerfile

@@ -118,6 +118,8 @@ WORKDIR /var/lib/zabbix
 
 VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/modules"]
 
+COPY ["docker-entrypoint.sh", "/usr/bin/"]
+
 ENTRYPOINT ["/sbin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
 
 USER 1997

docker-compose_v3_ubuntu_mysql_latest.yaml

@@ -169,8 +169,8 @@ services:
  zabbix-web-apache-mysql:
   image: zabbix/zabbix-web-apache-mysql:ubuntu-latest
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -196,7 +196,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -222,8 +222,8 @@ services:
  zabbix-web-nginx-mysql:
   image: zabbix/zabbix-web-nginx-mysql:ubuntu-latest
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -249,7 +249,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3

docker-compose_v3_ubuntu_mysql_local.yaml

@@ -185,8 +185,8 @@ services:
     - ubuntu:bionic
   image: zabbix-web-apache-mysql:ubuntu-local
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -212,7 +212,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -242,8 +242,8 @@ services:
     - ubuntu:bionic
   image: zabbix-web-nginx-mysql:ubuntu-local
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - mysql-server:mysql-server
    - zabbix-server:zabbix-server
@@ -269,7 +269,7 @@ services:
    - mysql-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3

docker-compose_v3_ubuntu_pgsql_latest.yaml

@@ -172,8 +172,8 @@ services:
  zabbix-web-apache-pgsql:
   image: zabbix/zabbix-web-apache-pgsql:ubuntu-latest
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -199,7 +199,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -225,8 +225,8 @@ services:
  zabbix-web-nginx-pgsql:
   image: zabbix/zabbix-web-nginx-pgsql:ubuntu-latest
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -252,7 +252,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3

docker-compose_v3_ubuntu_pgsql_local.yaml

@@ -177,8 +177,8 @@ services:
   build: ./web-apache-pgsql/ubuntu
   image: zabbix-web-apache-pgsql:ubuntu-local
   ports:
-   - "80:80"
+   - "80:8080"
-   - "443:443"
+   - "443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -204,7 +204,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3
@@ -231,8 +231,8 @@ services:
   build: ./web-nginx-pgsql/ubuntu
   image: zabbix-web-nginx-pgsql:ubuntu-local
   ports:
-   - "8081:80"
+   - "8081:8080"
-   - "8443:443"
+   - "8443:8443"
   links:
    - postgres-server:postgres-server
    - zabbix-server:zabbix-server
@@ -258,7 +258,7 @@ services:
    - postgres-server
    - zabbix-server
   healthcheck:
-   test: ["CMD", "curl", "-f", "http://localhost"]
+   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
    interval: 10s
    timeout: 5s
    retries: 3

snmptraps/ubuntu/.dockerignore

@@ -1,2 +1 @@
 build.sh
-snmptrapfmt_1.14+nmu1ubuntu2.tar.gz

snmptraps/ubuntu/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/snmp/mibs/iana:/var/lib/snmp/mibs/ietf:/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/snmp/mibs/iana:/var/lib/snmp/mibs/ietf:/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/ubuntu/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-apache-mysql/ubuntu/Dockerfile

@@ -35,6 +35,7 @@ RUN set -eux && \
             php7.2-mysql \
             php7.2-xml && \
     rm -f /etc/apache2/sites-available/* && \
+    rm -f /etc/apache2/sites-enabled/* && \
     /usr/sbin/a2enmod ssl && \
     sed -ri \
             -e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
@@ -115,4 +116,5 @@ USER 1997
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

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

@@ -183,7 +183,7 @@ check_db_connect() {
 }
 
 prepare_web_server() {
-    APACHE_SITES_DIR="/etc/apache2/sites-available"
+    APACHE_SITES_DIR="/etc/apache2/sites-enabled"
 
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then

web-apache-pgsql/ubuntu/Dockerfile

@@ -1,46 +1,31 @@
 FROM ubuntu:bionic
-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 APT_FLAGS_COMMON="-y"
+      org.opencontainers.image.url="https://zabbix.com/" \
-ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
+      org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \
-ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
+      org.opencontainers.image.licenses="GPL v2.0"
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=apache
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
-      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"
 
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install locales && \
-    locale-gen $LC_ALL && \
     echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
-    addgroup --system --quiet zabbix && \
+    addgroup --system --gid 1995 --quiet zabbix && \
     adduser --quiet \
             --system --disabled-login \
-            --ingroup zabbix \
+            --ingroup zabbix --ingroup root \
+            --uid 1997 \
             --home /var/lib/zabbix/ \
-            --no-create-home \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
+    apt-get -y update && \
-    apt-get ${APT_FLAGS_COMMON} update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install \
             apache2 \
             curl \
             libapache2-mod-php \
+            ca-certificates \
             php7.2-bcmath \
             php7.2-gd \
             php7.2-json \
@@ -48,29 +33,44 @@ RUN set -eux && \
             php7.2-mbstring \
             php7.2-xml \
             php7.2-pgsql \
-            postgresql-client \
+            postgresql-client && \
-            ttf-dejavu-core && \
+    rm -f /etc/apache2/sites-available/* && \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
+    rm -f /etc/apache2/sites-enabled/* && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
+    /usr/sbin/a2enmod ssl && \
+    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" && \
+    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" && \
+    sed -i 's/Listen 80/Listen 8080/g' /etc/apache2/ports.conf && \
+    sed -i 's/Listen 443/Listen 8443/g' /etc/apache2/ports.conf && \
+    sed -i 's|/var/run/apache2$SUFFIX|/tmp|g' /etc/apache2/envvars && \
+    rm -f /var/run/apache2/apache2.pid && \
+    apt-get -y autoremove && \
+    apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
 
 ARG MAJOR_VERSION=master
 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}
 
-LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
-      org.label-schema.version="${ZBX_VERSION}" \
+
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      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:ubuntu-${ZBX_VERSION}"
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
+
+COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
+    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_DEV} install \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             gettext \
-            patch \
+            git \
-            ca-certificates \
+            locales && \
-            git && \
     cd /usr/share/ && \
     git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
     mkdir /usr/share/zabbix/ && \
@@ -80,6 +80,8 @@ RUN set -eux && \
     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" && \
+    ./locale/make_mo.sh && \
     mkdir -p /var/lib/locales/supported.d/ && \
     rm -f /var/lib/locales/supported.d/local && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
@@ -88,24 +90,31 @@ RUN set -eux && \
     dpkg-reconfigure locales && \
     find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \
     find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.2/ && \
+    chgrp -R 0 /etc/apache2/ /etc/php/7.2/ && \
+    chmod -R g=u /etc/apache2/ /etc/php/7.2/ && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
             gettext \
-            patch \
+            git \
-            git && \
+            locales && \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
+    apt-get -y autoremove && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
+    apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
 
-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/7.2/apache2/conf.d/99-zabbix.ini", "/etc/php/7.2/apache2/conf.d/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
+USER 1997
+
 ENTRYPOINT ["docker-entrypoint.sh"]
+
+#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

web-nginx-mysql/ubuntu/Dockerfile

@@ -1,42 +1,25 @@
 FROM ubuntu:bionic
-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" \
+      org.opencontainers.image.url="https://zabbix.com/" \
+      org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
+      org.opencontainers.image.licenses="GPL v2.0"
 
-ARG APT_FLAGS_COMMON="-y"
-ARG APT_FLAGS_PERSISTENT="${APT_FLAGS_COMMON} --no-install-recommends"
-ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
-ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 TERM=xterm \
-    ZBX_TYPE=frontend ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx
-
-LABEL org.label-schema.name="zabbix-web-${ZBX_OPT_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
-      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"
-    
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
+    addgroup --system --gid 1995 --quiet zabbix && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install locales gnupg2 ca-certificates && \
-    locale-gen $LC_ALL && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
-    addgroup --system --quiet zabbix && \
     adduser --quiet \
             --system --disabled-login \
-            --ingroup zabbix \
+            --ingroup zabbix --ingroup root \
+            --uid 1997 \
             --home /var/lib/zabbix/ \
-            --no-create-home \
         zabbix && \
     mkdir -p /etc/zabbix && \
     mkdir -p /etc/zabbix/web && \
-    chown --quiet -R zabbix:root /etc/zabbix && \
+    apt-get -y update && \
-    apt-get ${APT_FLAGS_COMMON} update && \
     NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
     found=''; \
     for server in \
@@ -51,8 +34,8 @@ RUN set -eux && \
     test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
     DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \
     echo "deb https://nginx.org/packages/ubuntu/ $DISTRIB_CODENAME nginx" >> /etc/apt/sources.list.d/nginx.list && \
-    apt-get ${APT_FLAGS_COMMON} update && \
+    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_PERSISTENT} install \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             curl \
             mysql-client \
             nginx \
@@ -66,30 +49,31 @@ RUN set -eux && \
             php7.2-xml \
             supervisor && \
     rm -f /etc/nginx/conf.d/*.conf && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
+    rm -rf /var/cache/nginx/ && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
             wget && \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
+    apt-get -y autoremove && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
+    apt-get -y clean && \
-    mkdir -p /var/lib/php7 && \
-    chown --quiet -R www-data:www-data /var/lib/php7 && \
-    rm -rf /var/cache/nginx/* && \
     rm -rf /var/lib/apt/lists/*
 
 ARG MAJOR_VERSION=master
 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}
 
-LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
-      org.label-schema.version="${ZBX_VERSION}" \
+
-      org.label-schema.vcs-url="${ZBX_SOURCES}" \
+LABEL org.opencontainers.image.documentation="https://www.zabbix.com/documentation/${MAJOR_VERSION}/manual/installation/containers" \
-      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}:ubuntu-${ZBX_VERSION}"
+      org.opencontainers.image.version="${ZBX_VERSION}" \
+      org.opencontainers.image.source="${ZBX_SOURCES}"
+
+COPY ["conf/etc/", "/etc/"]
 
 RUN set -eux && \
-    apt-get ${APT_FLAGS_COMMON} update && \
+    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_DEV} install \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             gettext \
-            git && \
+            git \
+            locales && \
     cd /usr/share/ && \
     git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
     mkdir /usr/share/zabbix/ && \
@@ -99,6 +83,8 @@ RUN set -eux && \
     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" && \
+    ./locale/make_mo.sh && \
     mkdir -p /var/lib/locales/supported.d/ && \
     rm -f /var/lib/locales/supported.d/local && \
     cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \
@@ -107,25 +93,23 @@ RUN set -eux && \
     dpkg-reconfigure locales && \
     find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \
     find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \
-    DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
+    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
             gettext \
-            git && \
+            git \
-    apt-get ${APT_FLAGS_COMMON} autoremove && \
+            locales && \
-    apt-get ${APT_FLAGS_COMMON} clean && \
+    apt-get -y autoremove && \
+    apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
 
-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/7.2/fpm/conf.d/99-zabbix.ini", "/etc/php/7.2/fpm/conf.d/"]
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
 
 ENTRYPOINT ["docker-entrypoint.sh"]

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

@@ -1,10 +1,10 @@
-user www-data;
+#user nginx;
 worker_processes 5;
-#worker_rlimit_nofile 256000;
+worker_rlimit_nofile 256000;
 
-error_log /dev/fd/2 warn;
+error_log /dev/fd/2 error;
 
-pid        /var/run/nginx.pid;
+pid        /tmp/nginx.pid;
 
 events {
     worker_connections 5120;
@@ -21,6 +21,13 @@ http {
                     '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log /dev/fd/1 main;
+    error_log /dev/fd/2 error;
+
+    client_body_temp_path /tmp/client_body 1 2;
+    proxy_temp_path /tmp/proxy 1 2;
+    fastcgi_temp_path /tmp/fastcgi 1 2;
+    uwsgi_temp_path /tmp/uwsgi 1 2;
+    scgi_temp_path /tmp/scgi 1 2;
 
     client_body_timeout             5m;
     send_timeout                    5m;

web-nginx-mysql/ubuntu/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/ubuntu/conf/etc/zabbix/nginx.conf

@@ -1,5 +1,5 @@
 server {
-    listen          80;
+    listen          8080;
     server_name     zabbix;
     index           index.php;
 

web-nginx-mysql/ubuntu/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;
 

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

@@ -237,12 +237,6 @@ prepare_zbx_web_config() {
 
     ZBX_WEB_CONFIG="$ZABBIX_ETC_DIR/web/zabbix.conf.php"
 
-    if [ -f "/usr/share/zabbix/conf/zabbix.conf.php" ]; then
-        rm -f "/usr/share/zabbix/conf/zabbix.conf.php"
-    fi
-
-    ln -s "$ZBX_WEB_CONFIG" "/usr/share/zabbix/conf/zabbix.conf.php"
-
     PHP_CONFIG_FILE="/etc/php-fpm.d/zabbix.conf"
 
     update_config_var "$PHP_CONFIG_FILE" "php_value[max_execution_time]" "${ZBX_MAXEXECUTIONTIME:-"600"}"

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

@@ -1,10 +1,10 @@
-user www-data;
+#user nginx;
 worker_processes 5;
-#worker_rlimit_nofile 256000;
+worker_rlimit_nofile 256000;
 
-error_log /dev/fd/2 warn;
+error_log /dev/fd/2 error;
 
-pid        /var/run/nginx.pid;
+pid        /tmp/nginx.pid;
 
 events {
     worker_connections 5120;
@@ -21,6 +21,13 @@ http {
                     '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log /dev/fd/1 main;
+    error_log /dev/fd/2 error;
+
+    client_body_temp_path /tmp/client_body 1 2;
+    proxy_temp_path /tmp/proxy 1 2;
+    fastcgi_temp_path /tmp/fastcgi 1 2;
+    uwsgi_temp_path /tmp/uwsgi 1 2;
+    scgi_temp_path /tmp/scgi 1 2;
 
     client_body_timeout             5m;
     send_timeout                    5m;

web-nginx-pgsql/ubuntu/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/ubuntu/conf/etc/zabbix/nginx.conf

@@ -1,5 +1,5 @@
 server {
-    listen          80;
+    listen          8080;
     server_name     zabbix;
     index           index.php;
 

web-nginx-pgsql/ubuntu/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;