Dedicated build environment for Alpine and Ubuntu based images

2024-11-22 07:43:47 +01:00 · 2021-09-13 00:06:51 +02:00 · 2021-09-13 00:06:51 +02:00 · 18184f650e
commit 18184f650e
parent 9734874434
55 changed files with 2142 additions and 1404 deletions
--- a/agent/alpine/Dockerfile
+++ b/agent/alpine/Dockerfile
@ -1,14 +1,36 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix agent" \
      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"
+      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="${ZBX_SOURCES}"

 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"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -35,62 +57,9 @@ RUN set -eux && \
            libcurl \
            libmodbus \
            libldap && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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}"
-
-RUN set -eux && \
-    apk add --no-cache --virtual build-dependencies \
-            autoconf \
-            automake \
-            curl-dev \
-            openssl-dev \
-            openldap-dev \
-            libmodbus-dev \
-            g++ \
-            pcre-dev \
-            make \
-            git && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-agent \
-            --with-libcurl \
-            --with-libmodbus \
-            --with-ldap \
-            --with-openssl \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd && \
-    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 && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10050/TCP
--- a/agent/ubuntu/Dockerfile
+++ b/agent/ubuntu/Dockerfile
@ -1,25 +1,37 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix agent" \
      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"
+      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="${ZBX_SOURCES}"

 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"]
+
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        i686) export ARCH_SUFFIX='i386' ;; \
-        x86_64) [ -f /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
-        aarch64) export ARCH_SUFFIX='arm64' ;; \
-        armv7l) export ARCH_SUFFIX='armhf' ;; \
-        ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
-        s390x) export ARCH_SUFFIX='s390x' ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
-    esac; \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
    useradd \
@ -43,73 +55,6 @@ RUN set -eux && \
            libcurl4 \
            libmodbus5 \
            libldap-2.4 && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/* 
-
-ARG MAJOR_VERSION=6.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}"
-
-RUN set -eux && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            libcurl4-openssl-dev \
-            libc6-dev \
-            libmodbus-dev \
-            libldap2-dev \
-            libpcre3-dev \
-            libssl-dev \
-            make \
-            pkg-config \
-            git \
-            gcc && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-agent \
-            --with-libcurl \
-            --with-libmodbus \
-            --with-ldap \
-            --with-openssl \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /usr/sbin/zabbix_agentd && \
-    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 && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    apt-get -y purge \
-            autoconf \
-            automake \
-            libcurl4-openssl-dev \
-            libc6-dev \
-            libmodbus-dev \
-            libldap2-dev \
-            libssl-dev \
-            make \
-            pkg-config \
-            git \
-            gcc && \ 
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
--- a/agent2/alpine/Dockerfile
+++ b/agent2/alpine/Dockerfile
@ -1,14 +1,36 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix agent 2" \
      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 2 is deployed on a monitoring target to actively monitor local resources and applications" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2", "/usr/sbin/zabbix_agent2"]
+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}/src/go/conf/zabbix_agent2.conf", "/etc/zabbix/zabbix_agent2.conf"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -33,63 +55,9 @@ RUN set -eux && \
            pcre \
            coreutils \
            iputils && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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}"
-
-RUN set -eux && \
-    apk add --no-cache --virtual build-dependencies \
-            autoconf \
-            automake \
-            go \
-            g++ \
-            make \
-            git \
-            pcre-dev \
-            openssl-dev \
-            zlib-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    export GOPATH=/tmp/zabbix-${ZBX_VERSION}/go && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --with-openssl \
-            --enable-ipv6 \
-            --enable-agent2 \
-            --enable-agent \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 /usr/sbin/zabbix_agent2 && \
-    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}/src/go/conf/zabbix_agent2.conf /etc/zabbix/zabbix_agent2.conf && \
-    strip /usr/sbin/zabbix_agent2 && \
-    strip /usr/bin/zabbix_get && \
-    strip /usr/bin/zabbix_sender && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10050/TCP 31999/TCP
--- a/agent2/ubuntu/Dockerfile
+++ b/agent2/ubuntu/Dockerfile
@ -1,25 +1,37 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix agent 2" \
      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 2 is deployed on a monitoring target to actively monitor local resources and applications" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2", "/usr/sbin/zabbix_agent2"]
+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}/src/go/conf/zabbix_agent2.conf", "/etc/zabbix/zabbix_agent2.conf"]
+
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        i686) export ARCH_SUFFIX='i386' ;; \
-        x86_64) [ -f /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
-        aarch64) export ARCH_SUFFIX='arm64' ;; \
-        armv7l) export ARCH_SUFFIX='armhf' ;; \
-        ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
-        s390x) export ARCH_SUFFIX='s390x' ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
-    esac; \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
    useradd \
@ -43,73 +55,6 @@ RUN set -eux && \
            libssl1.1 \
            libcurl4 \
            libldap-2.4 && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/* 
-
-ARG MAJOR_VERSION=6.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}"
-
-RUN set -eux && \
-    export PATH=/usr/lib/go-1.16/bin:$PATH && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            libpcre3-dev \
-            libssl-dev \
-            zlib1g-dev \
-            make \
-            pkg-config \
-            git \
-            g++ \
-            golang-1.16 && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --with-openssl \
-            --enable-ipv6 \
-            --enable-agent2 \
-            --enable-agent \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 /usr/sbin/zabbix_agent2 && \
-    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}/src/go/conf/zabbix_agent2.conf /etc/zabbix/zabbix_agent2.conf && \
-    strip /usr/sbin/zabbix_agent2 && \
-    strip /usr/bin/zabbix_get && \
-    strip /usr/bin/zabbix_sender && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    apt-get -y purge \
-            autoconf \
-            automake \
-            libpcre3-dev \
-            libssl-dev \
-            zlib1g-dev \
-            make \
-            pkg-config \
-            git \
-            g++ \
-            golang && \ 
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
--- a/build-base/alpine/.dockerignore
+++ b/build-base/alpine/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-base/alpine/Dockerfile
+++ b/build-base/alpine/Dockerfile
@ -0,0 +1,47 @@
+# syntax=docker/dockerfile:1
+FROM alpine:3.14
+
+ARG MAJOR_VERSION=6.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} \
+    PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm
+
+LABEL org.opencontainers.image.title="Zabbix build base" \
+      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 build base image contains all required packages to build Zabbix images" \
+      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="${ZBX_SOURCES}"
+
+RUN set -eux && \
+    apk add --no-cache --clean-protected \
+            bash \
+            autoconf \
+            automake \
+            coreutils \
+            curl-dev \
+            libevent-dev \
+            libssh-dev \
+            sqlite-dev \
+            libmodbus-dev \
+            libxml2-dev \
+            mysql-dev \
+            net-snmp-dev \
+            openipmi-dev \
+            openldap-dev \
+            pcre-dev \
+            postgresql-dev \
+            openjdk8 \
+            gettext \
+            git \
+            g++ \
+            go \
+            make \
+            openjdk8-jre-base \
+            unixodbc-dev && \
+    rm -rf /var/cache/apk/*
--- a/build-base/alpine/build.sh
+++ b/build-base/alpine/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-base/ubuntu/.dockerignore
+++ b/build-base/ubuntu/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-base/ubuntu/Dockerfile
+++ b/build-base/ubuntu/Dockerfile
@ -0,0 +1,48 @@
+# syntax=docker/dockerfile:1
+FROM ubuntu:focal
+
+ARG MAJOR_VERSION=6.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} \
+    PATH=/usr/lib/go-1.16/bin:$PATH
+
+LABEL org.opencontainers.image.title="Zabbix build base" \
+      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 build base image contains all required packages to build Zabbix images" \
+      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="${ZBX_SOURCES}"
+
+RUN set -eux && \
+    apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+            bash \
+            autoconf \
+            automake \
+            binutils \
+            gcc \
+            libc6-dev \
+            libcurl4-openssl-dev \
+            libevent-dev \
+            libmodbus-dev \
+            libldap2-dev \
+            libmysqlclient-dev \
+            libopenipmi-dev \
+            libpcre3-dev \
+            libsnmp-dev \
+            libsqlite3-dev \
+            libpq-dev \
+            libssh-dev \
+            libxml2-dev \
+            make \
+            openjdk-8-jdk-headless \
+            pkg-config \
+            gettext \
+            git \
+            golang-1.16 \
+            unixodbc-dev
--- a/build-base/ubuntu/build.sh
+++ b/build-base/ubuntu/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-mysql/alpine/.dockerignore
+++ b/build-mysql/alpine/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-mysql/alpine/Dockerfile
+++ b/build-mysql/alpine/Dockerfile
@ -0,0 +1,71 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+LABEL org.opencontainers.image.title="Zabbix build base (MySQL)" \
+      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 build base for MySQL based images" \
+      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="${ZBX_SOURCES}"
+
+RUN set -eux && \
+    cd /tmp/ && \
+    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
+    cd /tmp/zabbix-${ZBX_VERSION} && \
+    zabbix_revision=`git rev-parse --short HEAD` && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
+    ./bootstrap.sh && \
+    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    ./configure \
+            --datadir=/usr/lib \
+            --libdir=/usr/lib/zabbix \
+            --prefix=/usr \
+            --sysconfdir=/etc/zabbix \
+            --enable-agent \
+            --enable-agent2 \
+            --enable-server \
+            --enable-proxy \
+            --enable-webservice \
+            --with-mysql \
+            --with-ldap \
+            --with-libcurl \
+            --with-libxml2 \
+            --enable-java \
+            --with-net-snmp \
+            --with-openipmi \
+            --with-openssl \
+            --with-ssh \
+            --with-libmodbus \
+            --with-unixodbc \
+            --enable-ipv6 \
+            --silent && \
+    make -j"$(nproc)" -s dbschema && \
+    make -j"$(nproc)" -s && \
+    make -j"$(nproc)" -s gettext && \
+    cat database/mysql/schema.sql > database/mysql/create.sql && \
+    cat database/mysql/images.sql >> database/mysql/create.sql && \
+    cat database/mysql/data.sql >> database/mysql/create.sql && \
+    gzip -c database/mysql/create.sql > database/mysql/create_server.sql.gz && \
+    rm -rf database/mysql/create.sql && \
+    cat database/mysql/schema.sql > database/mysql/create.sql && \
+    gzip -c database/mysql/create.sql > database/mysql/create_proxy.sql.gz && \
+    rm -rf database/mysql/create.sql && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
--- a/build-mysql/alpine/build.sh
+++ b/build-mysql/alpine/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-mysql/ubuntu/.dockerignore
+++ b/build-mysql/ubuntu/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-mysql/ubuntu/Dockerfile
+++ b/build-mysql/ubuntu/Dockerfile
@ -0,0 +1,71 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+LABEL org.opencontainers.image.title="Zabbix build base (MySQL)" \
+      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 build base for MySQL based images" \
+      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="${ZBX_SOURCES}"
+
+RUN set -eux && \
+    cd /tmp/ && \
+    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
+    cd /tmp/zabbix-${ZBX_VERSION} && \
+    zabbix_revision=`git rev-parse --short HEAD` && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
+    ./bootstrap.sh && \
+    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    ./configure \
+            --datadir=/usr/lib \
+            --libdir=/usr/lib/zabbix \
+            --prefix=/usr \
+            --sysconfdir=/etc/zabbix \
+            --enable-agent \
+            --enable-agent2 \
+            --enable-server \
+            --enable-proxy \
+            --enable-webservice \
+            --with-mysql \
+            --with-ldap \
+            --with-libcurl \
+            --with-libxml2 \
+            --enable-java \
+            --with-net-snmp \
+            --with-openipmi \
+            --with-openssl \
+            --with-ssh \
+            --with-libmodbus \
+            --with-unixodbc \
+            --enable-ipv6 \
+            --silent && \
+    make -j"$(nproc)" -s dbschema && \
+    make -j"$(nproc)" -s && \
+    make -j"$(nproc)" -s gettext && \
+    cat database/mysql/schema.sql > database/mysql/create.sql && \
+    cat database/mysql/images.sql >> database/mysql/create.sql && \
+    cat database/mysql/data.sql >> database/mysql/create.sql && \
+    gzip -c database/mysql/create.sql > database/mysql/create_server.sql.gz && \
+    rm -rf database/mysql/create.sql && \
+    cat database/mysql/schema.sql > database/mysql/create.sql && \
+    gzip -c database/mysql/create.sql > database/mysql/create_proxy.sql.gz && \
+    rm -rf database/mysql/create.sql && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
--- a/build-mysql/ubuntu/build.sh
+++ b/build-mysql/ubuntu/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-pgsql/alpine/.dockerignore
+++ b/build-pgsql/alpine/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-pgsql/alpine/Dockerfile
+++ b/build-pgsql/alpine/Dockerfile
@ -0,0 +1,71 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+LABEL org.opencontainers.image.title="Zabbix build base (PostgreSQL)" \
+      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 build base for PostgreSQL based images" \
+      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="${ZBX_SOURCES}"
+
+RUN set -eux && \
+    cd /tmp/ && \
+    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
+    cd /tmp/zabbix-${ZBX_VERSION} && \
+    zabbix_revision=`git rev-parse --short HEAD` && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
+    ./bootstrap.sh && \
+    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    ./configure \
+            --datadir=/usr/lib \
+            --libdir=/usr/lib/zabbix \
+            --prefix=/usr \
+            --sysconfdir=/etc/zabbix \
+            --enable-agent \
+            --enable-agent2 \
+            --enable-server \
+            --enable-proxy \
+            --enable-webservice \
+            --with-postgresql \
+            --with-ldap \
+            --with-libcurl \
+            --with-libxml2 \
+            --enable-java \
+            --with-net-snmp \
+            --with-openipmi \
+            --with-openssl \
+            --with-ssh \
+            --with-libmodbus \
+            --with-unixodbc \
+            --enable-ipv6 \
+            --silent && \
+    make -j"$(nproc)" -s dbschema && \
+    make -j"$(nproc)" -s && \
+    make -j"$(nproc)" -s gettext && \
+    cat database/postgresql/schema.sql > database/postgresql/create.sql && \
+    cat database/postgresql/images.sql >> database/postgresql/create.sql && \
+    cat database/postgresql/data.sql >> database/postgresql/create.sql && \
+    gzip -c database/postgresql/create.sql > database/postgresql/create_server.sql.gz && \
+    rm -rf database/postgresql/create.sql && \
+    cat database/postgresql/schema.sql > database/postgresql/create.sql && \
+    gzip -c database/postgresql/create.sql > database/postgresql/create_proxy.sql.gz && \
+    rm -rf database/postgresql/create.sql && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
--- a/build-pgsql/alpine/build.sh
+++ b/build-pgsql/alpine/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-pgsql/ubuntu/.dockerignore
+++ b/build-pgsql/ubuntu/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-pgsql/ubuntu/Dockerfile
+++ b/build-pgsql/ubuntu/Dockerfile
@ -0,0 +1,71 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+LABEL org.opencontainers.image.title="Zabbix build base (PostgreSQL)" \
+      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 build base for PostgreSQL based images" \
+      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="${ZBX_SOURCES}"
+
+RUN set -eux && \
+    cd /tmp/ && \
+    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
+    cd /tmp/zabbix-${ZBX_VERSION} && \
+    zabbix_revision=`git rev-parse --short HEAD` && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
+    ./bootstrap.sh && \
+    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    ./configure \
+            --datadir=/usr/lib \
+            --libdir=/usr/lib/zabbix \
+            --prefix=/usr \
+            --sysconfdir=/etc/zabbix \
+            --enable-agent \
+            --enable-agent2 \
+            --enable-server \
+            --enable-proxy \
+            --enable-webservice \
+            --with-postgresql \
+            --with-ldap \
+            --with-libcurl \
+            --with-libxml2 \
+            --enable-java \
+            --with-net-snmp \
+            --with-openipmi \
+            --with-openssl \
+            --with-ssh \
+            --with-libmodbus \
+            --with-unixodbc \
+            --enable-ipv6 \
+            --silent && \
+    make -j"$(nproc)" -s dbschema && \
+    make -j"$(nproc)" -s && \
+    make -j"$(nproc)" -s gettext && \
+    cat database/postgresql/schema.sql > database/postgresql/create.sql && \
+    cat database/postgresql/images.sql >> database/postgresql/create.sql && \
+    cat database/postgresql/data.sql >> database/postgresql/create.sql && \
+    gzip -c database/postgresql/create.sql > database/postgresql/create_server.sql.gz && \
+    rm -rf database/postgresql/create.sql && \
+    cat database/postgresql/schema.sql > database/postgresql/create.sql && \
+    gzip -c database/postgresql/create.sql > database/postgresql/create_proxy.sql.gz && \
+    rm -rf database/postgresql/create.sql && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
--- a/build-pgsql/ubuntu/build.sh
+++ b/build-pgsql/ubuntu/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-sqlite3/alpine/.dockerignore
+++ b/build-sqlite3/alpine/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-sqlite3/alpine/Dockerfile
+++ b/build-sqlite3/alpine/Dockerfile
@ -0,0 +1,59 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-base:alpine-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG 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}" \
+      org.opencontainers.image.title="Zabbix build base (SQLite3)" \
+      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 build base for SQLite3 based images" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+RUN set -eux && \
+    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
+    ls -lah /tmp/ && \
+    cd /tmp/zabbix-${ZBX_VERSION} && \
+    zabbix_revision=`git rev-parse --short HEAD` && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
+    ./bootstrap.sh && \
+    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    ./configure \
+            --datadir=/usr/lib \
+            --libdir=/usr/lib/zabbix \
+            --prefix=/usr \
+            --sysconfdir=/etc/zabbix \
+            --enable-agent \
+            --enable-agent2 \
+            --enable-proxy \
+            --with-sqlite3 \
+            --with-ldap \
+            --with-libcurl \
+            --with-libxml2 \
+            --enable-java \
+            --with-net-snmp \
+            --with-openipmi \
+            --with-openssl \
+            --with-ssh \
+            --with-libmodbus \
+            --with-unixodbc \
+            --enable-ipv6 \
+            --silent && \
+    make -j"$(nproc)" -s dbschema && \
+    make -j"$(nproc)" -s && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
--- a/build-sqlite3/alpine/build.sh
+++ b/build-sqlite3/alpine/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-sqlite3/ubuntu/.dockerignore
+++ b/build-sqlite3/ubuntu/.dockerignore
@ -0,0 +1 @@
+build.sh
--- a/build-sqlite3/ubuntu/Dockerfile
+++ b/build-sqlite3/ubuntu/Dockerfile
@ -0,0 +1,59 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-base:ubuntu-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG 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}" \
+      org.opencontainers.image.title="Zabbix build base (SQLite3)" \
+      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 build base for SQLite3 based images" \
+      org.opencontainers.image.licenses="GPL v2.0"
+
+RUN set -eux && \
+    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch /tmp/zabbix-${ZBX_VERSION} && \
+    ls -lah /tmp/ && \
+    cd /tmp/zabbix-${ZBX_VERSION} && \
+    zabbix_revision=`git rev-parse --short HEAD` && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
+    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
+    ./bootstrap.sh && \
+    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
+    ./configure \
+            --datadir=/usr/lib \
+            --libdir=/usr/lib/zabbix \
+            --prefix=/usr \
+            --sysconfdir=/etc/zabbix \
+            --enable-agent \
+            --enable-agent2 \
+            --enable-proxy \
+            --with-sqlite3 \
+            --with-ldap \
+            --with-libcurl \
+            --with-libxml2 \
+            --enable-java \
+            --with-net-snmp \
+            --with-openipmi \
+            --with-openssl \
+            --with-ssh \
+            --with-libmodbus \
+            --with-unixodbc \
+            --enable-ipv6 \
+            --silent && \
+    make -j"$(nproc)" -s dbschema && \
+    make -j"$(nproc)" -s && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_agent2 && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get && \
+    strip /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender
--- a/build-sqlite3/ubuntu/README.md
+++ b/build-sqlite3/ubuntu/README.md
@ -0,0 +1,304 @@
+![logo](https://assets.zabbix.com/img/logo/zabbix_logo_500x131.png)
+
+# What is Zabbix?
+
+Zabbix is an enterprise-class open source distributed monitoring solution.
+
+Zabbix is software that monitors numerous parameters of a network and the health and integrity of servers. Zabbix uses a flexible notification mechanism that allows users to configure e-mail based alerts for virtually any event. This allows a fast reaction to server problems. Zabbix offers excellent reporting and data visualisation features based on the stored data. This makes Zabbix ideal for capacity planning.
+
+For more information and related downloads for Zabbix components, please visit https://hub.docker.com/u/zabbix/ and https://zabbix.com
+
+# What is Zabbix server?
+
+Zabbix server is the central process of Zabbix software.
+
+The server performs the polling and trapping of data, it calculates triggers, sends notifications to users. It is the central component to which Zabbix agents and proxies report data on availability and integrity of systems. The server can itself remotely check networked services (such as web servers and mail servers) using simple service checks.
+
+# Zabbix server images
+
+These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.12, Ubuntu 20.04 (focal), CentOS 8 and Oracle Linux 8 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) (unsupported)
+    Zabbix server 3.0.* (tags: alpine-3.0.*, ubuntu-3.0.*, centos-3.0.*) (unsupported)
+    Zabbix server 3.2 (tags: alpine-3.2-latest, ubuntu-3.2-latest, centos-3.2-latest) (unsupported)
+    Zabbix server 3.2.* (tags: alpine-3.2.*, ubuntu-3.2.*, centos-3.2.*) (unsupported)
+    Zabbix server 3.4 (tags: alpine-3.4-latest, ubuntu-3.4-latest, centos-3.4-latest) (unsupported)
+    Zabbix server 3.4.* (tags: alpine-3.4.*, ubuntu-3.4.*, centos-3.4.*) (unsupported)
+    Zabbix server 4.0 (tags: alpine-4.0-latest, ubuntu-4.0-latest, centos-4.0-latest)
+    Zabbix server 4.0.* (tags: alpine-4.0.*, ubuntu-4.0.*, centos-4.0.*)
+    Zabbix server 4.2 (tags: alpine-4.2-latest, ubuntu-4.2-latest, centos-4.2-latest) (unsupported)
+    Zabbix server 4.2.* (tags: alpine-4.2.*, ubuntu-4.2.*, centos-4.2.*) (unsupported)
+    Zabbix server 4.4 (tags: alpine-4.4-latest, ubuntu-4.4-latest, centos-4.4-latest) (unsupported)
+    Zabbix server 4.4.* (tags: alpine-4.4.*, ubuntu-4.4.*, centos-4.4.*) (unsupported)
+    Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest)
+    Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*)
+    Zabbix server 5.2 (tags: alpine-5.2-latest, ubuntu-5.2-latest, ol-5.2-latest)
+    Zabbix server 5.2.* (tags: alpine-5.2.*, ubuntu-5.2.*, ol-5.2.*)
+    Zabbix server 5.4 (tags: alpine-5.4-latest, ubuntu-5.4-latest, ol-5.4-latest, alpine-latest, ubuntu-latest, ol-latest, latest)
+    Zabbix server 5.4.* (tags: alpine-5.4.*, ubuntu-5.4.*, ol-5.4.*)
+    Zabbix server 6.0 (tags: alpine-trunk, ubuntu-trunk, ol-trunk)
+
+Images are updated when new releases are published. The image with ``latest`` tag is based on Alpine Linux.
+
+The image uses MySQL database. It uses the next procedure to start:
+- Checking database availability
+- If ``MYSQL_ROOT_PASSWORD`` or ``MYSQL_ALLOW_EMPTY_PASSWORD`` are specified, the instance tries to create ``MYSQL_USER`` user with ``MYSQL_PASSWORD`` to use these credentials then for Zabbix server.
+- Checking of having `MYSQL_DATABASE` database. Creating `MYSQL_DATABASE` database name if it does not exist
+- Checking of having `dbversion` table. Creating Zabbix server database schema and upload initial data sample if no `dbversion` table
+
+# How to use this image
+
+## Start `zabbix-server-mysql`
+
+Start a Zabbix server container as follows:
+
+    docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER="some-user" -e MYSQL_PASSWORD="some-password" -d zabbix/zabbix-server-mysql:tag
+
+Where `some-zabbix-server-mysql` is the name you want to assign to your container, `some-mysql-server` is IP or DNS name of MySQL server, `some-user` is user to connect to Zabbix database on MySQL server, `some-password` is the password to connect to MySQL server and `tag` is the tag specifying the version you want. See the list above for relevant tags, or look at the [full list of tags](https://hub.docker.com/r/zabbix/zabbix-server-mysql/tags/).
+
+## Container shell access and viewing Zabbix server logs
+
+The `docker exec` command allows you to run commands inside a Docker container. The following command line will give you a bash shell inside your `zabbix-server-mysql` container:
+
+```console
+$ docker exec -ti some-zabbix-server-mysql /bin/bash
+```
+
+The Zabbix server log is available through Docker's container log:
+
+```console
+$ docker logs some-zabbix-server-mysql
+```
+
+## Environment Variables
+
+When you start the `zabbix-server-mysql` image, you can adjust the configuration of the Zabbix server by passing one or more environment variables on the `docker run` command line.
+
+### `DB_SERVER_HOST`
+
+This variable is IP or DNS name of MySQL server. By default, value is 'mysql-server'
+
+### `DB_SERVER_PORT`
+
+This variable is port of MySQL server. By default, value is '3306'.
+
+### `MYSQL_USER`, `MYSQL_PASSWORD`, `MYSQL_USER_FILE`, `MYSQL_PASSWORD_FILE`
+
+These variables are used by Zabbix server to connect to Zabbix database. With the `_FILE` variables you can instead provide the path to a file which contains the user / the password instead. Without Docker Swarm or Kubernetes you also have to map the files. Those are exclusive so you can just provide one type - either `MYSQL_USER` or `MYSQL_USER_FILE`!
+
+```console
+docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -v ./.MYSQL_USER:/run/secrets/MYSQL_USER -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -v ./.MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD -e MYSQL_PASSWORD_FILE=/var/run/secrets/MYSQL_PASSWORD -d zabbix/zabbix-server-mysql:tag
+```
+
+With Docker Swarm or Kubernetes this works with secrets. That way it is replicated in your cluster!
+
+```console
+printf "zabbix" | docker secret create MYSQL_USER -
+printf "zabbix" | docker secret create MYSQL_PASSWORD -
+docker run --name some-zabbix-server-mysql -e DB_SERVER_HOST="some-mysql-server" -e MYSQL_USER_FILE=/run/secrets/MYSQL_USER -e MYSQL_PASSWORD_FILE=/run/secrets/MYSQL_PASSWORD -d zabbix/zabbix-server-mysql:tag
+```
+
+This method is also applicable for `MYSQL_ROOT_PASSWORD` with `MYSQL_ROOT_PASSWORD_FILE`.
+
+By default, values for `MYSQL_USER` and `MYSQL_PASSWORD` are `zabbix`, `zabbix`.
+
+### `MYSQL_DATABASE`
+
+The variable is Zabbix database name. By default, value is `zabbix`.
+
+### `ZBX_LOADMODULE`
+
+The variable is list of comma separated loadable Zabbix modules. It works with  volume ``/var/lib/zabbix/modules``. The syntax of the variable is ``dummy1.so,dummy2.so``.
+
+### `ZBX_DEBUGLEVEL`
+
+The variable is used to specify debug level. By default, value is ``3``. It is ``DebugLevel`` parameter in ``zabbix_server.conf``. Allowed values are listed below:
+- ``0`` - basic information about starting and stopping of Zabbix processes;
+- ``1`` - critical information
+- ``2`` - error information
+- ``3`` - warnings
+- ``4`` - for debugging (produces lots of information)
+- ``5`` - extended debugging (produces even more information)
+
+### `ZBX_TIMEOUT`
+
+The variable is used to specify timeout for processing checks. By default, value is ``4``.
+
+### `ZBX_JAVAGATEWAY_ENABLE`
+
+The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is `false`.
+
+### Other variables
+
+Additionally the image allows to specify many other environment variables listed below:
+
+```
+ZBX_DBTLSCONNECT= # Available since 5.0.0
+ZBX_DBTLSCAFILE= # Available since 5.0.0
+ZBX_DBTLSCERTFILE= # Available since 5.0.0
+ZBX_DBTLSKEYFILE= # Available since 5.0.0
+ZBX_DBTLSCIPHER= # Available since 5.0.0
+ZBX_DBTLSCIPHER13= # Available since 5.0.0
+ZBX_VAULTDBPATH= # Available since 5.2.0
+ZBX_VAULTURL=https://127.0.0.1:8200 # Available since 5.2.0
+VAULT_TOKEN= # Available since 5.2.0
+ZBX_LISTENIP=
+ZBX_STARTREPORTWRITERS=0 # Available since 5.4.0
+ZBX_WEBSERVICEURL=http://zabbix-web-service:10053/report # Available since 5.4.0
+ZBX_HISTORYSTORAGEURL= # Available since 3.4.0
+ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.0
+ZBX_STARTPOLLERS=5
+ZBX_IPMIPOLLERS=0
+ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
+ZBX_STARTPOLLERSUNREACHABLE=1
+ZBX_STARTTRAPPERS=5
+ZBX_STARTPINGERS=1
+ZBX_STARTDISCOVERERS=1
+ZBX_STARTHISTORYPOLLERS=5 # Available since 5.4.0
+ZBX_STARTHTTPPOLLERS=1
+ZBX_STARTTIMERS=1
+ZBX_STARTESCALATORS=1
+ZBX_STARTALERTERS=3 # Available since 3.4.0
+ZBX_JAVAGATEWAY=zabbix-java-gateway
+ZBX_JAVAGATEWAYPORT=10052
+ZBX_STARTJAVAPOLLERS=5
+ZBX_STARTLLDPROCESSORS=2 # Available since 4.2.0
+ZBX_STATSALLOWEDIP= # Available since 4.0.5
+ZBX_STARTVMWARECOLLECTORS=0
+ZBX_VMWAREFREQUENCY=60
+ZBX_VMWAREPERFFREQUENCY=60
+ZBX_VMWARECACHESIZE=8M
+ZBX_VMWARETIMEOUT=10
+ZBX_ENABLE_SNMP_TRAPS=false
+ZBX_SOURCEIP=
+ZBX_HOUSEKEEPINGFREQUENCY=1
+ZBX_MAXHOUSEKEEPERDELETE=5000
+ZBX_SENDERFREQUENCY=30
+ZBX_CACHESIZE=8M
+ZBX_CACHEUPDATEFREQUENCY=60
+ZBX_STARTDBSYNCERS=4
+ZBX_EXPORTFILESIZE=1G # Available since 4.0.0
+ZBX_EXPORTTYPE= # Available since 5.0.10 and 5.2.6
+ZBX_HISTORYCACHESIZE=16M
+ZBX_HISTORYINDEXCACHESIZE=4M
+ZBX_HISTORYSTORAGEDATEINDEX=0 # Available since 4.0.0
+ZBX_TRENDCACHESIZE=4M
+ZBX_VALUECACHESIZE=8M
+ZBX_TRAPPERTIMEOUT=300
+ZBX_UNREACHABLEPERIOD=45
+ZBX_UNAVAILABLEDELAY=60
+ZBX_UNREACHABLEDELAY=15
+ZBX_LOGSLOWQUERIES=3000
+ZBX_STARTPROXYPOLLERS=1
+ZBX_PROXYCONFIGFREQUENCY=3600
+ZBX_PROXYDATAFREQUENCY=1
+ZBX_TLSCAFILE=
+ZBX_TLSCRLFILE=
+ZBX_TLSCERTFILE=
+ZBX_TLSKEYFILE=
+ZBX_TLSCIPHERALL= # Available since 4.4.7
+ZBX_TLSCIPHERALL13= # Available since 4.4.7
+ZBX_TLSCIPHERCERT= # Available since 4.4.7
+ZBX_TLSCIPHERCERT13= # Available since 4.4.7
+ZBX_TLSCIPHERPSK= # Available since 4.4.7
+ZBX_TLSCIPHERPSK13= # Available since 4.4.7
+```
+
+Default values of these variables are specified after equal sign.
+
+The allowed variables are identical of parameters in official ``zabbix_server.conf``. For example, ``ZBX_LOGSLOWQUERIES`` = ``LogSlowQueries``.
+
+Please use official documentation for [``zabbix_server.conf``](https://www.zabbix.com/documentation/current/manual/appendix/config/zabbix_server) to get more information about the variables.
+
+## Allowed volumes for the Zabbix server container
+
+### ``/usr/lib/zabbix/alertscripts``
+
+The volume is used for custom alert scripts. It is `AlertScriptsPath` parameter in ``zabbix_server.conf``.
+
+### ``/usr/lib/zabbix/externalscripts``
+
+The volume is used by External checks (type of items). It is `ExternalScripts` parameter in ``zabbix_server.conf``.
+
+### ``/var/lib/zabbix/modules``
+
+The volume allows load additional modules and extend Zabbix server using ``LoadModule`` feature.
+
+### ``/var/lib/zabbix/enc``
+
+The volume is used to store TLS related files. These file names are specified using ``ZBX_TLSCAFILE``, ``ZBX_TLSCRLFILE``, ``ZBX_TLSKEY_FILE`` and ``ZBX_TLSPSKFILE`` variables.
+
+### ``/var/lib/zabbix/ssh_keys``
+
+The volume is used as location of public and private keys for SSH checks and actions. It is `SSHKeyLocation` parameter in ``zabbix_server.conf``.
+
+### ``/var/lib/zabbix/ssl/certs``
+
+The volume is used as location of of SSL client certificate files for client authentication. It is `SSLCertLocation` parameter in ``zabbix_server.conf``.
+
+### ``/var/lib/zabbix/ssl/keys``
+
+The volume is used as location of SSL private key files for client authentication. It is `SSLKeyLocation` parameter in ``zabbix_server.conf``.
+
+### ``/var/lib/zabbix/ssl/ssl_ca``
+
+The volume is used as location of certificate authority (CA) files for SSL server certificate verification. It is `SSLCALocation` parameter in ``zabbix_server.conf``.
+
+### ``/var/lib/zabbix/snmptraps``
+
+The volume is used as location of ``snmptraps.log`` file. It could be shared by ``zabbix-snmptraps`` container and inherited using `volumes_from` Docker option while creating new instance of Zabbix server.
+SNMP traps processing feature could be enabled using shared volume and switched ``ZBX_ENABLE_SNMP_TRAPS`` environment variable to `true`.
+
+### ``/var/lib/zabbix/mibs``
+
+The volume allows to add new MIB files. It does not support subdirectories, all MIBs must be placed to ``/var/lib/zabbix/mibs``.
+
+### ``/var/lib/zabbix/export``
+
+Directory for real-time export of events, history and trends in newline-delimited JSON format. Could be enabled using ``ZBX_EXPORTFILESIZE`` environment variable.
+
+# The image variants
+
+The `zabbix-server-mysql` images come in many flavors, each designed for a specific use case.
+
+## `zabbix-server-mysql:alpine-<version>`
+
+This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
+
+This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
+
+To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
+
+## `zabbix-server-mysql:ubuntu-<version>`
+
+This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
+
+## `zabbix-server-mysql:ol-<version>`
+
+Oracle Linux is an open-source operating system available under the GNU General Public License (GPLv2). Suitable for general purpose or Oracle workloads, it benefits from rigorous testing of more than 128,000 hours per day with real-world workloads and includes unique innovations such as Ksplice for zero-downtime kernel patching, DTrace for real-time diagnostics, the powerful Btrfs file system, and more.
+
+# Supported Docker versions
+
+This image is officially supported on Docker version 1.12.0.
+
+Support for older versions (down to 1.6) is provided on a best-effort basis.
+
+Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon.
+
+# User Feedback
+
+## Documentation
+
+Documentation for this image is stored in the [`server-mysql/` directory](https://github.com/zabbix/zabbix-docker/tree/3.0/server-mysql) of the [`zabbix/zabbix-docker` GitHub repo](https://github.com/zabbix/zabbix-docker/). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/zabbix/zabbix-docker/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues).
+
+### Known issues
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans through a [GitHub issue](https://github.com/zabbix/zabbix-docker/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
--- a/build-sqlite3/ubuntu/build.sh
+++ b/build-sqlite3/ubuntu/build.sh
@ -0,0 +1 @@
+../../build.sh
--- a/build-sqlite3/ubuntu/docker-entrypoint.sh
+++ b/build-sqlite3/ubuntu/docker-entrypoint.sh
@ -0,0 +1,487 @@
+#!/bin/bash
+
+set -o pipefail
+
+set +e
+
+# Script trace mode
+if [ "${DEBUG_MODE,,}" == "true" ]; then
+    set -o xtrace
+fi
+
+# Default directories
+# User 'zabbix' home directory
+ZABBIX_USER_HOME_DIR="/var/lib/zabbix"
+# Configuration files directory
+ZABBIX_ETC_DIR="/etc/zabbix"
+
+# usage: file_env VAR [DEFAULT]
+# as example: file_env 'MYSQL_PASSWORD' 'zabbix'
+#    (will allow for "$MYSQL_PASSWORD_FILE" to fill in the value of "$MYSQL_PASSWORD" from a file)
+# unsets the VAR_FILE afterwards and just leaving VAR
+file_env() {
+    local var="$1"
+    local fileVar="${var}_FILE"
+    local defaultValue="${2:-}"
+
+    if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
+        echo "**** Both variables $var and $fileVar are set (but are exclusive)"
+        exit 1
+    fi
+
+    local val="$defaultValue"
+
+    if [ "${!var:-}" ]; then
+        val="${!var}"
+        echo "** Using ${var} variable from ENV"
+    elif [ "${!fileVar:-}" ]; then
+        if [ ! -f "${!fileVar}" ]; then
+            echo "**** Secret file \"${!fileVar}\" is not found"
+            exit 1
+        fi
+        val="$(< "${!fileVar}")"
+        echo "** Using ${var} variable from secret file"
+    fi
+    export "$var"="$val"
+    unset "$fileVar"
+}
+
+escape_spec_char() {
+    local var_value=$1
+
+    var_value="${var_value//\\/\\\\}"
+    var_value="${var_value//[$'\n']/}"
+    var_value="${var_value//\//\\/}"
+    var_value="${var_value//./\\.}"
+    var_value="${var_value//\*/\\*}"
+    var_value="${var_value//^/\\^}"
+    var_value="${var_value//\$/\\\$}"
+    var_value="${var_value//\&/\\\&}"
+    var_value="${var_value//\[/\\[}"
+    var_value="${var_value//\]/\\]}"
+
+    echo "$var_value"
+}
+
+update_config_var() {
+    local config_path=$1
+    local var_name=$2
+    local var_value=$3
+    local is_multiple=$4
+
+    local masklist=("DBPassword TLSPSKIdentity")
+
+    if [ ! -f "$config_path" ]; then
+        echo "**** Configuration file '$config_path' does not exist"
+        return
+    fi
+
+    if [[ " ${masklist[@]} " =~ " $var_name " ]] && [ ! -z "$var_value" ]; then
+        echo -n "** Updating '$config_path' parameter \"$var_name\": '****'. Enable DEBUG_MODE to view value ..."
+    else
+        echo -n "** Updating '$config_path' parameter \"$var_name\": '$var_value'..."
+    fi
+
+    # Remove configuration parameter definition in case of unset parameter value
+    if [ -z "$var_value" ]; then
+        sed -i -e "/^$var_name=/d" "$config_path"
+        echo "removed"
+        return
+    fi
+
+    # Remove value from configuration parameter in case of double quoted parameter value
+    if [ "$var_value" == '""' ]; then
+        sed -i -e "/^$var_name=/s/=.*/=/" "$config_path"
+        echo "undefined"
+        return
+    fi
+
+    # Use full path to a file for TLS related configuration parameters
+    if [[ $var_name =~ ^TLS.*File$ ]]; then
+        var_value=$ZABBIX_USER_HOME_DIR/enc/$var_value
+    fi
+
+    # Escaping characters in parameter value and name
+    var_value=$(escape_spec_char "$var_value")
+    var_name=$(escape_spec_char "$var_name")
+
+    if [ "$(grep -E "^$var_name=" $config_path)" ] && [ "$is_multiple" != "true" ]; then
+        sed -i -e "/^$var_name=/s/=.*/=$var_value/" "$config_path"
+        echo "updated"
+    elif [ "$(grep -Ec "^# $var_name=" $config_path)" -gt 1 ]; then
+        sed -i -e  "/^[#;] $var_name=$/i\\$var_name=$var_value" "$config_path"
+        echo "added first occurrence"
+    else
+        sed -i -e "/^[#;] $var_name=/s/.*/&\n$var_name=$var_value/" "$config_path"
+        echo "added"
+    fi
+
+}
+
+update_config_multiple_var() {
+    local config_path=$1
+    local var_name=$2
+    local var_value=$3
+
+    var_value="${var_value%\"}"
+    var_value="${var_value#\"}"
+
+    local IFS=,
+    local OPT_LIST=($var_value)
+
+    for value in "${OPT_LIST[@]}"; do
+        update_config_var $config_path $var_name $value true
+    done
+}
+
+# Check prerequisites for MySQL database
+check_variables_mysql() {
+    : ${DB_SERVER_HOST:="mysql-server"}
+    : ${DB_SERVER_PORT:="3306"}
+    USE_DB_ROOT_USER=false
+    CREATE_ZBX_DB_USER=false
+    file_env MYSQL_USER
+    file_env MYSQL_PASSWORD
+
+    file_env MYSQL_ROOT_PASSWORD
+
+    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
+    fi
+
+    if [ ! -n "${MYSQL_USER}" ] && [ ! -n "${MYSQL_ROOT_PASSWORD}" ] && [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" != "true" ]; then
+        echo "*** Impossible to use MySQL server because 'root' password is not defined and it is not empty"
+        exit 1
+    fi
+
+    if [ "${MYSQL_ALLOW_EMPTY_PASSWORD,,}" == "true" ] || [ -n "${MYSQL_ROOT_PASSWORD}" ]; then
+        USE_DB_ROOT_USER=true
+        DB_SERVER_ROOT_USER="root"
+        DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""}
+    fi
+
+    [ -n "${MYSQL_USER}" ] && [ "${USE_DB_ROOT_USER}" == "true" ] && CREATE_ZBX_DB_USER=true
+
+    # If root password is not specified use provided credentials
+    : ${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"}
+
+    DB_SERVER_DBNAME=${MYSQL_DATABASE:-"zabbix"}
+}
+
+db_tls_params() {
+    local result=""
+
+    if [ -n "${ZBX_DBTLSCONNECT}" ]; then
+        ssl_mode=${ZBX_DBTLSCONNECT//verify_full/verify_identity}
+        result="--ssl-mode=$ssl_mode"
+
+        if [ -n "${ZBX_DBTLSCAFILE}" ]; then
+            result="${result} --ssl-ca=${ZBX_DBTLSCAFILE}"
+        fi
+
+        if [ -n "${ZBX_DBTLSKEYFILE}" ]; then
+            result="${result} --ssl-key=${ZBX_DBTLSKEYFILE}"
+        fi
+
+        if [ -n "${ZBX_DBTLSCERTFILE}" ]; then
+            result="${result} --ssl-cert=${ZBX_DBTLSCERTFILE}"
+        fi
+    fi
+
+    echo $result
+}
+
+check_db_connect_mysql() {
+    echo "********************"
+    echo "* DB_SERVER_HOST: ${DB_SERVER_HOST}"
+    echo "* DB_SERVER_PORT: ${DB_SERVER_PORT}"
+    echo "* DB_SERVER_DBNAME: ${DB_SERVER_DBNAME}"
+    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 "********************"
+
+    WAIT_TIMEOUT=5
+
+    ssl_opts="$(db_tls_params)"
+
+    export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
+
+    while [ ! "$(mysqladmin ping -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} -u ${DB_SERVER_ROOT_USER} \
+                --silent --connect_timeout=10 $ssl_opts)" ]; do
+        echo "**** MySQL server is not available. Waiting $WAIT_TIMEOUT seconds..."
+        sleep $WAIT_TIMEOUT
+    done
+
+    unset MYSQL_PWD
+}
+
+mysql_query() {
+    query=$1
+    local result=""
+
+    ssl_opts="$(db_tls_params)"
+
+    export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
+
+    result=$(mysql --silent --skip-column-names -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
+             -u ${DB_SERVER_ROOT_USER} -e "$query" $ssl_opts)
+
+    unset MYSQL_PWD
+
+    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_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_schema_mysql() {
+    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"
+
+        ssl_opts="$(db_tls_params)"
+
+        export MYSQL_PWD="${DB_SERVER_ROOT_PASS}"
+
+        zcat /usr/share/doc/zabbix-server-mysql/create.sql.gz | mysql --silent --skip-column-names \
+                    -h ${DB_SERVER_HOST} -P ${DB_SERVER_PORT} \
+                    -u ${DB_SERVER_ROOT_USER} $ssl_opts  \
+                    ${DB_SERVER_DBNAME} 1>/dev/null
+
+        unset MYSQL_PWD
+    fi
+}
+
+update_zbx_config() {
+    echo "** Preparing Zabbix server configuration file"
+
+    ZBX_CONFIG=$ZABBIX_ETC_DIR/zabbix_server.conf
+
+    update_config_var $ZBX_CONFIG "ListenIP" "${ZBX_LISTENIP}"
+    update_config_var $ZBX_CONFIG "ListenPort" "${ZBX_LISTENPORT}"
+
+    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 [ -n "${ZBX_DBTLSCONNECT}" ]; then
+        update_config_var $ZBX_CONFIG "DBTLSConnect" "${ZBX_DBTLSCONNECT}"
+        update_config_var $ZBX_CONFIG "DBTLSCAFile" "${ZBX_DBTLSCAFILE}"
+        update_config_var $ZBX_CONFIG "DBTLSCertFile" "${ZBX_DBTLSCERTFILE}"
+        update_config_var $ZBX_CONFIG "DBTLSKeyFile" "${ZBX_DBTLSKEYFILE}"
+        update_config_var $ZBX_CONFIG "DBTLSCipher" "${ZBX_DBTLSCIPHER}"
+        update_config_var $ZBX_CONFIG "DBTLSCipher13" "${ZBX_DBTLSCIPHER13}"
+    fi
+
+    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 "DBPort" "${DB_SERVER_PORT}"
+
+    if [ -n "${VAULT_TOKEN}" ]; then
+        update_config_var $ZBX_CONFIG "VaultDBPath" "${ZBX_VAULTDBPATH}"
+        update_config_var $ZBX_CONFIG "VaultURL" "${ZBX_VAULTURL}"
+        update_config_var $ZBX_CONFIG "DBUser"
+        update_config_var $ZBX_CONFIG "DBPassword"
+    else
+        update_config_var $ZBX_CONFIG "VaultDBPath"
+        update_config_var $ZBX_CONFIG "VaultURL"
+        update_config_var $ZBX_CONFIG "DBUser" "${DB_SERVER_ZBX_USER}"
+        update_config_var $ZBX_CONFIG "DBPassword" "${DB_SERVER_ZBX_PASS}"
+    fi
+
+    update_config_var $ZBX_CONFIG "StartReportWriters" "${ZBX_STARTREPORTWRITERS}"
+    : ${ZBX_WEBSERVICEURL:="http://zabbix-web-service:10053/report"}
+    update_config_var $ZBX_CONFIG "WebServiceURL" "${ZBX_WEBSERVICEURL}"
+
+    update_config_var $ZBX_CONFIG "HistoryStorageURL" "${ZBX_HISTORYSTORAGEURL}"
+    update_config_var $ZBX_CONFIG "HistoryStorageTypes" "${ZBX_HISTORYSTORAGETYPES}"
+    update_config_var $ZBX_CONFIG "HistoryStorageDateIndex" "${ZBX_HISTORYSTORAGEDATEINDEX}"
+
+    update_config_var $ZBX_CONFIG "DBSocket" "${DB_SERVER_SOCKET}"
+
+    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 "StartHistoryPollers" "${ZBX_STARTHISTORYPOLLERS}"
+    update_config_var $ZBX_CONFIG "StartHTTPPollers" "${ZBX_STARTHTTPPOLLERS}"
+
+    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}"
+    update_config_var $ZBX_CONFIG "StartTimers" "${ZBX_STARTTIMERS}"
+    update_config_var $ZBX_CONFIG "StartEscalators" "${ZBX_STARTESCALATORS}"
+
+    update_config_var $ZBX_CONFIG "StartLLDProcessors" "${ZBX_STARTLLDPROCESSORS}"
+
+    : ${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:="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}"
+    update_config_var $ZBX_CONFIG "MaxHousekeeperDelete" "${ZBX_MAXHOUSEKEEPERDELETE}"
+    update_config_var $ZBX_CONFIG "SenderFrequency" "${ZBX_SENDERFREQUENCY}"
+
+    update_config_var $ZBX_CONFIG "CacheSize" "${ZBX_CACHESIZE}"
+
+    update_config_var $ZBX_CONFIG "CacheUpdateFrequency" "${ZBX_CACHEUPDATEFREQUENCY}"
+
+    update_config_var $ZBX_CONFIG "StartDBSyncers" "${ZBX_STARTDBSYNCERS}"
+    update_config_var $ZBX_CONFIG "HistoryCacheSize" "${ZBX_HISTORYCACHESIZE}"
+    update_config_var $ZBX_CONFIG "HistoryIndexCacheSize" "${ZBX_HISTORYINDEXCACHESIZE}"
+
+    update_config_var $ZBX_CONFIG "TrendCacheSize" "${ZBX_TRENDCACHESIZE}"
+    update_config_var $ZBX_CONFIG "ValueCacheSize" "${ZBX_VALUECACHESIZE}"
+
+    update_config_var $ZBX_CONFIG "Timeout" "${ZBX_TIMEOUT}"
+    update_config_var $ZBX_CONFIG "TrapperTimeout" "${ZBX_TRAPPERTIMEOUT}"
+    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"
+
+    if [ -n "${ZBX_EXPORTFILESIZE}" ]; then
+        update_config_var $ZBX_CONFIG "ExportDir" "$ZABBIX_USER_HOME_DIR/export/"
+        update_config_var $ZBX_CONFIG "ExportFileSize" "${ZBX_EXPORTFILESIZE}"
+        update_config_var $ZBX_CONFIG "ExportType" "${ZBX_EXPORTTYPE}"
+    fi
+
+    update_config_var $ZBX_CONFIG "FpingLocation" "/usr/bin/fping"
+    update_config_var $ZBX_CONFIG "Fping6Location" "/usr/bin/fping6"
+
+    update_config_var $ZBX_CONFIG "SSHKeyLocation" "$ZABBIX_USER_HOME_DIR/ssh_keys"
+    update_config_var $ZBX_CONFIG "LogSlowQueries" "${ZBX_LOGSLOWQUERIES}"
+
+    update_config_var $ZBX_CONFIG "StartProxyPollers" "${ZBX_STARTPROXYPOLLERS}"
+    update_config_var $ZBX_CONFIG "ProxyConfigFrequency" "${ZBX_PROXYCONFIGFREQUENCY}"
+    update_config_var $ZBX_CONFIG "ProxyDataFrequency" "${ZBX_PROXYDATAFREQUENCY}"
+
+    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}"
+
+    update_config_var $ZBX_CONFIG "TLSCAFile" "${ZBX_TLSCAFILE}"
+    update_config_var $ZBX_CONFIG "TLSCRLFile" "${ZBX_TLSCRLFILE}"
+
+    update_config_var $ZBX_CONFIG "TLSCertFile" "${ZBX_TLSCERTFILE}"
+    update_config_var $ZBX_CONFIG "TLSCipherAll" "${ZBX_TLSCIPHERALL}"
+    update_config_var $ZBX_CONFIG "TLSCipherAll13" "${ZBX_TLSCIPHERALL13}"
+    update_config_var $ZBX_CONFIG "TLSCipherCert" "${ZBX_TLSCIPHERCERT}"
+    update_config_var $ZBX_CONFIG "TLSCipherCert13" "${ZBX_TLSCIPHERCERT13}"
+    update_config_var $ZBX_CONFIG "TLSCipherPSK" "${ZBX_TLSCIPHERPSK}"
+    update_config_var $ZBX_CONFIG "TLSCipherPSK13" "${ZBX_TLSCIPHERPSK13}"
+    update_config_var $ZBX_CONFIG "TLSKeyFile" "${ZBX_TLSKEYFILE}"
+
+    update_config_var $ZBX_CONFIG "TLSPSKIdentity" "${ZBX_TLSPSKIDENTITY}"
+    update_config_var $ZBX_CONFIG "TLSPSKFile" "${ZBX_TLSPSKFILE}"
+
+    if [ "$(id -u)" != '0' ]; then
+        update_config_var $ZBX_CONFIG "User" "$(whoami)"
+    else
+        update_config_var $ZBX_CONFIG "AllowRoot" "1"
+    fi
+}
+
+prepare_server() {
+    echo "** Preparing Zabbix server"
+
+    check_variables_mysql
+    check_db_connect_mysql
+    create_db_user_mysql
+    create_db_database_mysql
+    create_db_schema_mysql
+
+    update_zbx_config
+}
+
+#################################################
+
+if [ "${1#-}" != "$1" ]; then
+    set -- /usr/sbin/zabbix_server "$@"
+    fi
+
+if [ "$1" == '/usr/sbin/zabbix_server' ]; then
+    prepare_server
+fi
+
+exec "$@"
+
+#################################################
--- a/build.sh
+++ b/build.sh
@ -37,7 +37,7 @@ else
    VCS_REF=$MAJOR_VERSION.$MINOR_VERSION
 fi

-docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile .
+DOCKER_BUILDKIT=1 docker build -t zabbix-$app_component:$os-$version --build-arg VCS_REF="$VCS_REF" --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -f Dockerfile .

 if [ "$type" != "build" ]; then
    links=""
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@ -1,10 +1,41 @@
 version: '3.5'
 services:
+ zabbix-build-base:
+  build:
+   context: ./build-base/alpine
+   cache_from:
+    - alpine:3.14
+  image: zabbix-build-base:alpine-local
+
+ zabbix-build-mysql:
+  build:
+   context: ./build-mysql/alpine
+   cache_from:
+    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
+  image: zabbix-build-mysql:alpine-local
+  depends_on:
+   - zabbix-build-base
+
+ zabbix-build-sqlite3:
+  build:
+   context: ./build-sqlite3/alpine
+   cache_from:
+    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
+  image: zabbix-build-sqlite3:alpine-local
+  depends_on:
+   - zabbix-build-base
+
 zabbix-server:
-  build: 
+  build:
   context: ./server-mysql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-server-mysql:alpine-local
  ports:
   - "10051:10051"
@ -44,6 +75,7 @@ services:
 #   - root-ca.pem
  depends_on:
   - mysql-server
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
     aliases:
@ -72,6 +104,8 @@ services:
   context: ./proxy-sqlite3/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local
  image: zabbix-proxy-sqlite3:alpine-local
  profiles:
   - all
@ -105,6 +139,7 @@ services:
  depends_on:
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-sqlite3
  networks:
   zbx_net_backend:
    aliases:
@ -125,6 +160,8 @@ services:
   context: ./proxy-mysql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-proxy-mysql:alpine-local
  profiles:
   - all
@ -160,6 +197,7 @@ services:
   - mysql-server
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-mysql
  secrets:
   - MYSQL_USER
   - MYSQL_PASSWORD
@ -187,6 +225,8 @@ services:
   context: ./web-apache-mysql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-web-apache-mysql:alpine-local
  profiles:
   - all
@ -218,6 +258,7 @@ services:
  depends_on:
   - mysql-server
   - zabbix-server
+   - zabbix-build-mysql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -247,6 +288,8 @@ services:
   context: ./web-nginx-mysql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-web-nginx-mysql:alpine-local
  ports:
   - "80:8080"
@ -276,6 +319,7 @@ services:
  depends_on:
   - mysql-server
   - zabbix-server
+   - zabbix-build-mysql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -305,7 +349,11 @@ services:
   context: ./agent/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-agent:alpine-local
+  deploy:
+   mode: global
  profiles:
   - full
   - all
@ -331,6 +379,8 @@ services:
   - .env_agent
  privileged: true
  pid: "host"
+  depends_on:
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
@ -349,6 +399,8 @@ services:
   context: ./java-gateway/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-java-gateway:alpine-local
  profiles:
   - full
@ -365,6 +417,8 @@ services:
      memory: 256M
  env_file:
   - .env_java
+  depends_on:
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
@ -415,6 +469,8 @@ services:
   context: ./web-service/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-web-service:alpine-local
  profiles:
   - full
@ -435,6 +491,8 @@ services:
      memory: 256M
  env_file:
   - .env_web_service
+  depends_on:
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@ -1,10 +1,52 @@
 version: '3.5'
 services:
+ zabbix-build-base:
+  build:
+   context: ./build-base/alpine
+   cache_from:
+    - alpine:3.14
+  image: zabbix-build-base:alpine-local
+
+ zabbix-build-pgsql:
+  build:
+   context: ./build-pgsql/alpine
+   cache_from:
+    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
+  image: zabbix-build-pgsql:alpine-local
+  depends_on:
+   - zabbix-build-base
+
+ zabbix-build-mysql:
+  build:
+   context: ./build-mysql/alpine
+   cache_from:
+    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
+  image: zabbix-build-mysql:alpine-local
+  depends_on:
+   - zabbix-build-base
+
+ zabbix-build-sqlite3:
+  build:
+   context: ./build-sqlite3/alpine
+   cache_from:
+    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:alpine-local
+  image: zabbix-build-sqlite3:alpine-local
+  depends_on:
+   - zabbix-build-base
+
 zabbix-server:
  build:
   context: ./server-pgsql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
  image: zabbix-server-pgsql:alpine-local
  ports:
   - "10051:10051"
@ -43,6 +85,7 @@ services:
   - POSTGRES_PASSWORD
  depends_on:
   - postgres-server
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
     aliases:
@ -71,6 +114,8 @@ services:
   context: ./proxy-sqlite3/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-sqlite3:alpine-local
  image: zabbix-proxy-sqlite3:alpine-local
  profiles:
   - all
@ -104,6 +149,7 @@ services:
  depends_on:
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-sqlite3
  networks:
   zbx_net_backend:
    aliases:
@ -124,6 +170,8 @@ services:
   context: ./proxy-mysql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:alpine-local
  image: zabbix-proxy-mysql:alpine-local
  profiles:
   - all
@ -163,6 +211,7 @@ services:
   - mysql-server
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
@ -183,6 +232,8 @@ services:
   context: ./web-apache-pgsql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
  image: zabbix-web-apache-pgsql:alpine-local
  profiles:
   - all
@ -214,6 +265,7 @@ services:
  depends_on:
   - postgres-server
   - zabbix-server
+   - zabbix-build-pgsql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -243,6 +295,8 @@ services:
   context: ./web-nginx-pgsql/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
  image: zabbix-web-nginx-pgsql:alpine-local
  ports:
   - "80:8080"
@ -272,6 +326,7 @@ services:
  depends_on:
   - postgres-server
   - zabbix-server
+   - zabbix-build-pgsql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -301,6 +356,8 @@ services:
   context: ./agent/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
  image: zabbix-agent:alpine-local
  profiles:
   - full
@ -327,6 +384,8 @@ services:
   - .env_agent
  privileged: true
  pid: "host"
+  depends_on:
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
    aliases:
@ -345,6 +404,8 @@ services:
   context: ./java-gateway/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
  image: zabbix-java-gateway:alpine-local
  profiles:
   - full
@ -361,6 +422,8 @@ services:
      memory: 256M
  env_file:
   - .env_java
+  depends_on:
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
    aliases:
@ -411,6 +474,8 @@ services:
   context: ./web-service/alpine
   cache_from:
    - alpine:3.14
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:alpine-local
  image: zabbix-web-service:alpine-local
  profiles:
   - full
@ -431,6 +496,8 @@ services:
      memory: 256M
  env_file:
   - .env_web_service
+  depends_on:
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
    aliases:
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@ -1,10 +1,41 @@
 version: '3.5'
 services:
+ zabbix-build-base:
+  build:
+   context: ./build-base/ubuntu
+   cache_from:
+    - ubuntu:focal
+  image: zabbix-build-base:ubuntu-local
+
+ zabbix-build-mysql:
+  build:
+   context: ./build-mysql/ubuntu
+   cache_from:
+    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
+  image: zabbix-build-mysql:ubuntu-local
+  depends_on:
+   - zabbix-build-base
+
+ zabbix-build-sqlite3:
+  build:
+   context: ./build-sqlite3/ubuntu
+   cache_from:
+    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
+  image: zabbix-build-sqlite3:ubuntu-local
+  depends_on:
+   - zabbix-build-base
+
 zabbix-server:
  build: 
   context: ./server-mysql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-server-mysql:ubuntu-local
  ports:
   - "10051:10051"
@ -43,6 +74,7 @@ services:
 #   - root-ca.pem
  depends_on:
   - mysql-server
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
     aliases:
@ -71,6 +103,8 @@ services:
   context: ./proxy-sqlite3/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-sqlite3:ubuntu-local
  image: zabbix-proxy-sqlite3:ubuntu-local
  profiles:
   - all
@ -103,6 +137,7 @@ services:
  depends_on:
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-sqlite3
  networks:
   zbx_net_backend:
    aliases:
@ -123,6 +158,8 @@ services:
   context: ./proxy-mysql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-proxy-mysql:ubuntu-local
  profiles:
   - all
@ -157,6 +194,7 @@ services:
   - mysql-server
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-mysql
  secrets:
   - MYSQL_USER
   - MYSQL_PASSWORD
@ -184,6 +222,8 @@ services:
   context: ./web-apache-mysql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-web-apache-mysql:ubuntu-local
  profiles:
   - all
@ -214,6 +254,7 @@ services:
  depends_on:
   - mysql-server
   - zabbix-server
+   - zabbix-build-mysql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -243,6 +284,8 @@ services:
   context: ./web-nginx-mysql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-web-nginx-mysql:ubuntu-local
  ports:
   - "80:8080"
@ -271,6 +314,7 @@ services:
  depends_on:
   - mysql-server
   - zabbix-server
+   - zabbix-build-mysql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -300,6 +344,8 @@ services:
   context: ./agent/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-agent:ubuntu-local
  profiles:
   - full
@ -325,6 +371,8 @@ services:
   - .env_agent
  privileged: true
  pid: "host"
+  depends_on:
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
@ -343,6 +391,8 @@ services:
   context: ./java-gateway/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-java-gateway:ubuntu-local
  profiles:
   - full
@ -359,6 +409,8 @@ services:
      memory: 256M
  env_file:
   - .env_java
+  depends_on:
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
@ -409,6 +461,8 @@ services:
   context: ./web-service/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-web-service:ubuntu-local
  profiles:
   - full
@ -429,6 +483,8 @@ services:
      memory: 256M
  env_file:
   - .env_web_service
+  depends_on:
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@ -1,10 +1,52 @@
 version: '3.5'
 services:
+ zabbix-build-base:
+  build:
+   context: ./build-base/ubuntu
+   cache_from:
+    - ubuntu:focal
+  image: zabbix-build-base:ubuntu-local
+
+ zabbix-build-pgsql:
+  build:
+   context: ./build-pgsql/ubuntu
+   cache_from:
+    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
+  image: zabbix-build-pgsql:ubuntu-local
+  depends_on:
+   - zabbix-build-base
+
+ zabbix-build-mysql:
+  build:
+   context: ./build-mysql/ubuntu
+   cache_from:
+    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
+  image: zabbix-build-mysql:ubuntu-local
+  depends_on:
+   - zabbix-build-base
+
+ zabbix-build-sqlite3:
+  build:
+   context: ./build-sqlite3/ubuntu
+   cache_from:
+    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-base:ubuntu-local
+  image: zabbix-build-sqlite3:ubuntu-local
+  depends_on:
+   - zabbix-build-base
+
 zabbix-server:
  build:
   context: ./server-pgsql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local
  image: zabbix-server-pgsql:ubuntu-local
  ports:
   - "10051:10051"
@ -42,6 +84,7 @@ services:
   - POSTGRES_PASSWORD
  depends_on:
   - postgres-server
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
     aliases:
@ -70,6 +113,8 @@ services:
   context: ./proxy-sqlite3/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-sqlite3:ubuntu-local
  image: zabbix-proxy-sqlite3:ubuntu-local
  profiles:
   - all
@ -102,6 +147,7 @@ services:
  depends_on:
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-sqlite3
  networks:
   zbx_net_backend:
    aliases:
@ -122,6 +168,8 @@ services:
   context: ./proxy-mysql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-mysql:ubuntu-local
  image: zabbix-proxy-mysql:ubuntu-local
  profiles:
   - all
@ -160,6 +208,7 @@ services:
   - mysql-server
   - zabbix-java-gateway
   - zabbix-snmptraps
+   - zabbix-build-mysql
  networks:
   zbx_net_backend:
    aliases:
@ -180,6 +229,8 @@ services:
   context: ./web-apache-pgsql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local
  image: zabbix-web-apache-pgsql:ubuntu-local
  profiles:
   - all
@ -210,6 +261,7 @@ services:
  depends_on:
   - postgres-server
   - zabbix-server
+   - zabbix-build-pgsql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -239,6 +291,8 @@ services:
   context: ./web-nginx-pgsql/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local
  image: zabbix-web-nginx-pgsql:ubuntu-local
  ports:
   - "80:8080"
@ -267,6 +321,7 @@ services:
  depends_on:
   - postgres-server
   - zabbix-server
+   - zabbix-build-pgsql
  healthcheck:
   test: ["CMD", "curl", "-f", "http://localhost:8080/"]
   interval: 10s
@ -296,6 +351,8 @@ services:
   context: ./agent/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local
  image: zabbix-agent:ubuntu-local
  profiles:
   - full
@ -321,6 +378,8 @@ services:
   - .env_agent
  privileged: true
  pid: "host"
+  depends_on:
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
    aliases:
@ -339,6 +398,8 @@ services:
   context: ./java-gateway/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local
  image: zabbix-java-gateway:ubuntu-local
  profiles:
   - full
@ -355,6 +416,8 @@ services:
      memory: 256M
  env_file:
   - .env_java
+  depends_on:
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
    aliases:
@ -405,6 +468,8 @@ services:
   context: ./web-service/ubuntu
   cache_from:
    - ubuntu:focal
+   args:
+    BUILD_BASE_IMAGE: zabbix-build-pgsql:ubuntu-local
  image: zabbix-web-service:ubuntu-local
  profiles:
   - full
@ -425,6 +490,8 @@ services:
      memory: 256M
  env_file:
   - .env_web_service
+  depends_on:
+   - zabbix-build-pgsql
  networks:
   zbx_net_backend:
    aliases:
--- a/java-gateway/alpine/Dockerfile
+++ b/java-gateway/alpine/Dockerfile
@ -1,14 +1,36 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm
+
 LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
      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"
+      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="${ZBX_SOURCES}"

 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"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -26,57 +48,10 @@ RUN set -eux && \
    apk add --clean-protected --no-cache \
            bash \
            openjdk8-jre-base && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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} \
-    PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ JAVA_HOME=/usr/lib/jvm/default-jvm
-
-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 && \
-    apk add --no-cache --virtual build-dependencies \
-            autoconf \
-            automake \
-            coreutils \
-            pkgconf \
-            git \
-            g++ \
-            make \
-            openjdk8 && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
-    ./bootstrap.sh && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-java \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    mkdir -p /usr/sbin/zabbix_java/ && \
-    cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \
-    cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \
    rm -rf /usr/sbin/zabbix_java/lib/*.xml && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
    chgrp -R 0 /etc/zabbix/ /usr/sbin/zabbix_java/ && \
    chmod -R g=u /etc/zabbix/ /usr/sbin/zabbix_java/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10052/TCP
--- a/java-gateway/ubuntu/Dockerfile
+++ b/java-gateway/ubuntu/Dockerfile
@ -1,14 +1,35 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
      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"
-    
+      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="${ZBX_SOURCES}"
+
 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"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
@ -25,63 +46,7 @@ RUN set -eux && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
            openjdk-8-jre-headless && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ARG MAJOR_VERSION=6.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 && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            libc6-dev \
-            make \
-            openjdk-8-jdk-headless \
-            pkg-config \
-            git \
-            gcc && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java && \
-    ./bootstrap.sh && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-java \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    mkdir -p /usr/sbin/zabbix_java/ && \
-    cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \
-    cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \
    rm -rf /usr/sbin/zabbix_java/lib/*.xml && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            autoconf \
-            automake \
-            libc6-dev \
-            make \
-            openjdk-8-jdk \
-            pkg-config \
-            git \
-            gcc && \
    apt-get -y autoremove && \
    apt-get -y clean && \
    chown --quiet -R zabbix:root /etc/zabbix/ /usr/sbin/zabbix_java/ && \
@ -90,16 +55,16 @@ RUN set -eux && \
    rm -rf /var/lib/apt/lists/*

 EXPOSE 10052/TCP
-    
+
 WORKDIR /var/lib/zabbix

 VOLUME ["/usr/sbin/zabbix_java/ext_lib"]

 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"]
--- a/proxy-mysql/alpine/Dockerfile
+++ b/proxy-mysql/alpine/Dockerfile
@ -1,14 +1,38 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG 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 proxy (MySQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy", "/usr/sbin/zabbix_proxy"]
+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_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql.gz", "/usr/share/doc/zabbix-proxy-mysql/create.sql.gz"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -48,79 +72,12 @@ RUN set -eux && \
            openipmi-libs \
            pcre \
            unixodbc \
+#           Temporary!!
+            libmodbus \
            fping && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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} \
-    MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
-
-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 && \
-    apk add --no-cache --virtual build-dependencies \
-            autoconf \
-            automake \
-            coreutils \
-            curl-dev \
-            libevent-dev \
-            g++ \
-            git \
-            make \
-            libssh-dev \
-            libxml2-dev \
-            mysql-dev \
-            net-snmp-dev \
-            openipmi-dev \
-            openldap-dev \
-            pcre-dev \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-agent \
-            --enable-proxy \
-            --with-mysql \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
-    cat database/mysql/schema.sql > database/mysql/create.sql && \
-    gzip database/mysql/create.sql && \
-    cp database/mysql/create.sql.gz /usr/share/doc/zabbix-proxy-mysql/ && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10051/TCP
--- a/proxy-mysql/ubuntu/Dockerfile
+++ b/proxy-mysql/ubuntu/Dockerfile
@ -1,25 +1,40 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
+
 LABEL org.opencontainers.image.title="Zabbix proxy (MySQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy", "/usr/sbin/zabbix_proxy"]
+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_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_proxy.sql.gz", "/usr/share/doc/zabbix-proxy-mysql/create.sql.gz"]
+
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        i686) export ARCH_SUFFIX='i386' ;; \
-        x86_64) [ -f /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
-        aarch64) export ARCH_SUFFIX='arm64' ;; \
-        armv7l) export ARCH_SUFFIX='armhf' ;; \
-        ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
-        s390x) export ARCH_SUFFIX='s390x' ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
-    esac; \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
    useradd \
@ -56,102 +71,16 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
+#            Temporary!
+            libmodbus5 \
            mysql-client \
            snmp-mibs-downloader \
            unixodbc && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ARG MAJOR_VERSION=6.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-
-ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/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 && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libmysqlclient-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libsnmp-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-agent \
-            --enable-proxy \
-            --with-mysql \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
-    cat database/mysql/schema.sql > database/mysql/create.sql && \
-    gzip database/mysql/create.sql && \
-    cp database/mysql/create.sql.gz /usr/share/doc/zabbix-proxy-mysql/ && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libmysqlclient-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libsnmp-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
    apt-get -y autoremove && \
+    apt-get -y clean && \
    rm -rf /var/lib/apt/lists/*

 EXPOSE 10051/TCP
--- a/proxy-sqlite3/alpine/Dockerfile
+++ b/proxy-sqlite3/alpine/Dockerfile
@ -1,14 +1,36 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG 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 proxy (SQLite3)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy", "/usr/sbin/zabbix_proxy"]
+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_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -45,79 +67,14 @@ RUN set -eux && \
            libxml2 \
            net-snmp-agent-libs \
            openipmi-libs \
+#           Temporary!
+            libmodbus \
            pcre \
            sqlite-libs \
            unixodbc && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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.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 && \
-    apk add --no-cache --virtual build-dependencies \
-            autoconf \
-            automake \
-            coreutils \
-            curl-dev \
-            libevent-dev \
-            libssh-dev \
-            libxml2-dev \
-            net-snmp-dev \
-            openipmi-dev \
-            openldap-dev \
-            pcre-dev \
-            sqlite-dev \
-            git \
-            g++ \
-            make \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-agent \
-            --enable-proxy \
-            --with-sqlite3 \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10051/TCP
--- a/proxy-sqlite3/ubuntu/Dockerfile
+++ b/proxy-sqlite3/ubuntu/Dockerfile
@ -1,25 +1,38 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION}
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
+
 LABEL org.opencontainers.image.title="Zabbix proxy (SQLite3)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_proxy/zabbix_proxy", "/usr/sbin/zabbix_proxy"]
+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_proxy.conf", "/etc/zabbix/zabbix_proxy.conf"]
+
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        i686) export ARCH_SUFFIX='i386' ;; \
-        x86_64) [ -f /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
-        aarch64) export ARCH_SUFFIX='arm64' ;; \
-        armv7l) export ARCH_SUFFIX='armhf' ;; \
-        ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
-        s390x) export ARCH_SUFFIX='s390x' ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
-    esac; \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
    useradd \
@ -56,110 +69,26 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
+#            Temporary!
+            libmodbus5 \
            snmp-mibs-downloader \
            unixodbc && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ARG MAJOR_VERSION=6.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-
-ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/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 && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libsnmp-dev \
-            libsqlite3-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-agent \
-            --enable-proxy \
-            --with-sqlite3 \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_proxy/zabbix_proxy /usr/sbin/zabbix_proxy && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_proxy.conf /etc/zabbix/zabbix_proxy.conf && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libsnmp-dev \
-            libsqlite3-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
    apt-get -y autoremove && \
    rm -rf /var/lib/apt/lists/*

 EXPOSE 10051/TCP
-            
+
 WORKDIR /var/lib/zabbix
-            
+
 VOLUME ["/var/lib/zabbix/snmptraps"]
-            
+
 COPY ["docker-entrypoint.sh", "/usr/bin/"]
-            
+
 ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/docker-entrypoint.sh"]
-            
+
 USER 1997
-    
+
 CMD ["/usr/sbin/zabbix_proxy", "--foreground", "-c", "/etc/zabbix/zabbix_proxy.conf"]
--- a/server-mysql/alpine/Dockerfile
+++ b/server-mysql/alpine/Dockerfile
@ -1,14 +1,38 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG 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 server (MySQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server", "/usr/sbin/zabbix_server"]
+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_server.conf", "/etc/zabbix/zabbix_server.conf"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -45,6 +69,7 @@ RUN set -eux && \
            libcurl \
            libevent \
            libldap \
+            libmodbus \
            libssh \
            libxml2 \
            mariadb-client \
@ -53,80 +78,9 @@ RUN set -eux && \
            openipmi-libs \
            pcre \
            unixodbc && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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} \
-    MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
-
-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 && \
-    apk add --no-cache --virtual build-dependencies \
-            autoconf \
-            automake \
-            coreutils \
-            curl-dev \
-            libevent-dev \
-            libssh-dev \
-            libxml2-dev \
-            mysql-dev \
-            net-snmp-dev \
-            openipmi-dev \
-            openldap-dev \
-            pcre-dev \
-            git \
-            g++ \
-            make \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --enable-agent \
-            --enable-server \
-            --with-mysql \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
-    cat database/mysql/schema.sql > database/mysql/create.sql && \
-    cat database/mysql/images.sql >> database/mysql/create.sql && \
-    cat database/mysql/data.sql >> database/mysql/create.sql && \
-    gzip database/mysql/create.sql && \
-    cp database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/ && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10051/TCP
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@ -1,25 +1,40 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
+
 LABEL org.opencontainers.image.title="Zabbix server (MySQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server", "/usr/sbin/zabbix_server"]
+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_server.conf", "/etc/zabbix/zabbix_server.conf"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/mysql/create_server.sql.gz", "/usr/share/doc/zabbix-server-mysql/create.sql.gz"]
+
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        i686) export ARCH_SUFFIX='i386' ;; \
-        x86_64) [ -f /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
-        aarch64) export ARCH_SUFFIX='arm64' ;; \
-        armv7l) export ARCH_SUFFIX='armhf' ;; \
-        ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
-        s390x) export ARCH_SUFFIX='s390x' ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \
-    esac; \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
    useradd \
@ -61,104 +76,16 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
+#            Temporary!
+            libmodbus5 \
            mysql-client \
            snmp-mibs-downloader \
            unixodbc && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ARG MAJOR_VERSION=6.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-
-ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/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 && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libmysqlclient-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libsnmp-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --enable-agent \
-            --enable-server \
-            --with-mysql \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
-    cat database/mysql/schema.sql > database/mysql/create.sql && \
-    cat database/mysql/images.sql >> database/mysql/create.sql && \
-    cat database/mysql/data.sql >> database/mysql/create.sql && \
-    gzip database/mysql/create.sql && \
-    cp database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/ && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libmysqlclient-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libsnmp-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
    apt-get -y autoremove && \
+    apt-get -y clean && \
    rm -rf /var/lib/apt/lists/*

 EXPOSE 10051/TCP
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@ -1,14 +1,39 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG 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 server (PostgreSQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server", "/usr/sbin/zabbix_server"]
+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_server.conf", "/etc/zabbix/zabbix_server.conf"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/create_server.sql.gz", "/usr/share/doc/zabbix-server-postgresql/create.sql.gz"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb.sql", "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -50,85 +75,14 @@ RUN set -eux && \
            net-snmp-agent-libs \
            openipmi-libs \
            pcre \
+#           Termporay!
+            libmodbus \
            postgresql-client \
            postgresql-libs \
            unixodbc && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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} \
-    MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
-
-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 && \
-    apk add --no-cache --virtual build-dependencies \
-            alpine-sdk \
-            autoconf \
-            automake \
-            coreutils \
-            curl-dev \
-            libevent-dev \
-            libssh-dev \
-            libxml2-dev \
-            net-snmp-dev \
-            openipmi-dev \
-            openldap-dev \
-            pcre-dev \
-            postgresql-dev \
-            git \
-            g++ \
-            make \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --enable-agent \
-            --enable-server \
-            --with-postgresql \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
-    cat database/postgresql/schema.sql > database/postgresql/create.sql && \
-    cat database/postgresql/images.sql >> database/postgresql/create.sql && \
-    cat database/postgresql/data.sql >> database/postgresql/create.sql && \
-    gzip database/postgresql/create.sql && \
-    cp database/postgresql/create.sql.gz /usr/share/doc/zabbix-server-postgresql/ && \
-    cp database/postgresql/timescaledb.sql /usr/share/doc/zabbix-server-postgresql/ && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10051/TCP
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@ -1,25 +1,41 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm \
+    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
+    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL
+
 LABEL org.opencontainers.image.title="Zabbix server (PostgreSQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/zabbix_server/zabbix_server", "/usr/sbin/zabbix_server"]
+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_server.conf", "/etc/zabbix/zabbix_server.conf"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/create_server.sql.gz", "/usr/share/doc/zabbix-server-postgresql/create.sql.gz"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/database/postgresql/timescaledb.sql", "/usr/share/doc/zabbix-server-postgresql/timescaledb.sql"]
+
 RUN set -eux && \
-    ARCH_SUFFIX="$(arch)"; \
-    case "$ARCH_SUFFIX" in \
-        i686) export ARCH_SUFFIX='i386' ;; \
-        x86_64) [ -f /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ] && export ARCH_SUFFIX='amd64' || export ARCH_SUFFIX='i386' ;; \
-        aarch64) export ARCH_SUFFIX='arm64' ;; \
-        armv7l) export ARCH_SUFFIX='armhf' ;; \
-        ppc64el|ppc64le) export ARCH_SUFFIX='ppc64le' ;; \
-        s390x) export ARCH_SUFFIX='s390x' ;; \
-        *) echo "Unknown ARCH_SUFFIX=${ARCH_SUFFIX-}"; exit 1 ;; \                                  
-    esac; \                                                                                         
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
    useradd \
@ -61,105 +77,16 @@ RUN set -eux && \
            libssh-4 \
            libssl1.1 \
            libxml2 \
+#            Temporary!
+            libmodbus5 \
            postgresql-client \
            snmp-mibs-downloader \
            unixodbc && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ARG MAJOR_VERSION=6.0
-ARG ZBX_VERSION=${MAJOR_VERSION}
-ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
-
-ENV TERM=xterm MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/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 && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libpq-dev \
-            libsnmp-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" include/version.h && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --enable-agent \
-            --enable-server \
-            --with-postgresql \
-            --with-ldap \
-            --with-libcurl \
-            --with-libxml2 \
-            --with-net-snmp \
-            --with-openipmi \
-            --with-openssl \
-            --with-ssh \
-            --with-unixodbc \
-            --enable-ipv6 \
-            --silent && \
-    make -j"$(nproc)" -s dbschema && \
-    make -j"$(nproc)" -s && \
-    cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
-    cp src/zabbix_get/zabbix_get /usr/bin/zabbix_get && \
-    cp src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender && \
-    cp conf/zabbix_server.conf /etc/zabbix/zabbix_server.conf && \
-    cat database/postgresql/schema.sql > database/postgresql/create.sql && \
-    cat database/postgresql/images.sql >> database/postgresql/create.sql && \
-    cat database/postgresql/data.sql >> database/postgresql/create.sql && \
-    gzip database/postgresql/create.sql && \
-    cp database/postgresql/create.sql.gz /usr/share/doc/zabbix-server-postgresql/ && \
-    cp database/postgresql/timescaledb.sql /usr/share/doc/zabbix-server-postgresql/timescaledb.sql && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            autoconf \
-            automake \
-            gcc \
-            libc6-dev \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libldap2-dev \
-            libopenipmi-dev \
-            libpcre3-dev \
-            libpq-dev \
-            libsnmp-dev \
-            libssh-dev \
-            libxml2-dev \
-            make \
-            pkg-config \
-            git \
-            unixodbc-dev && \
    apt-get -y autoremove && \
+    apt-get -y clean && \
    rm -rf /var/lib/apt/lists/*

 EXPOSE 10051/TCP
--- a/web-apache-mysql/alpine/Dockerfile
+++ b/web-apache-mysql/alpine/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
      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 Apache2 web server with MySQL database support" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -56,36 +76,13 @@ RUN set -eux && \
        "/etc/apache2/conf.d/mpm.conf" && \
    sed -i 's/Listen 80/Listen 8080/g' /etc/apache2/httpd.conf && \
    rm -rf "/var/run/apache2/" && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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 && \
-    apk add --no-cache --virtual build-dependencies \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
-    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
    ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \
+    find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \
+    find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \
    chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
    chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
    chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \
@ -95,8 +92,6 @@ RUN set -eux && \
    chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 8080/TCP 8443/TCP
--- a/web-apache-mysql/ubuntu/Dockerfile
+++ b/web-apache-mysql/ubuntu/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
      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 Apache2 web server with MySQL database support" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
@ -51,37 +71,12 @@ RUN set -eux && \
    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=6.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 && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
+            gettext && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
-    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
    ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \
    mkdir -p /var/lib/locales/supported.d/ && \
@ -102,8 +97,7 @@ RUN set -eux && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            gettext \
-            git && \
+            gettext && \
    apt-get -y autoremove && \
    apt-get -y clean && \
    rm -rf /var/lib/apt/lists/*
--- a/web-apache-pgsql/alpine/Dockerfile
+++ b/web-apache-pgsql/alpine/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
      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 Apache2 web server with PostgreSQL database support" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -32,7 +52,7 @@ RUN set -eux && \
            php7-gd \
            php7-gettext \
            php7-json \
-            php7-ldap \    
+            php7-ldap \
            php7-pgsql \
            php7-mbstring \
            php7-session \
@ -55,31 +75,7 @@ RUN set -eux && \
        "/etc/apache2/conf.d/mpm.conf" && \
    sed -i 's/Listen 80/Listen 8080/g' /etc/apache2/httpd.conf && \
    rm -rf "/var/run/apache2/" && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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 && \
-    apk add --no-cache --virtual build-dependencies \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
@ -94,8 +90,6 @@ RUN set -eux && \
    chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 8080/TCP 8443/TCP
--- a/web-apache-pgsql/ubuntu/Dockerfile
+++ b/web-apache-pgsql/ubuntu/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)" \
      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 Apache2 web server with PostgreSQL database support" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
@ -51,37 +71,12 @@ RUN set -eux && \
    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=6.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 && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
+            gettext && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
-    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
    ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \
    mkdir -p /var/lib/locales/supported.d/ && \
@ -102,8 +97,7 @@ RUN set -eux && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            gettext \
-            git && \
+            gettext && \
    apt-get -y autoremove && \
    apt-get -y clean && \
    rm -rf /var/lib/apt/lists/*
--- a/web-nginx-mysql/alpine/Dockerfile
+++ b/web-nginx-mysql/alpine/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -49,32 +69,7 @@ RUN set -eux && \
    rm -rf /etc/php7/php-fpm.d/www.conf && \
    rm -f /etc/nginx/http.d/*.conf && \
    ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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 && \
-    apk add --no-cache --virtual build-dependencies \
-            coreutils \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
@ -92,8 +87,6 @@ RUN set -eux && \
    chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 8080/TCP 8443/TCP
--- a/web-nginx-mysql/ubuntu/Dockerfile
+++ b/web-nginx-mysql/ubuntu/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
      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"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
@ -43,7 +63,8 @@ RUN set -eux && \
    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 -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends \
+        -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install \
            curl \
            mysql-client \
            nginx \
@ -61,38 +82,11 @@ RUN set -eux && \
    rm -rf /var/cache/nginx/ && \
    rm -f /etc/php/7.4/fpm/pool.d/www.conf && \
    ln -sf /dev/fd/2 /var/log/nginx/error.log && \
+    rm -f /etc/php/7.4/fpm/php-fpm.conf.dpkg-dist && \
    DEBIAN_FRONTEND=noninteractive apt-get -y purge gpg dirmngr gpg-agent && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ARG MAJOR_VERSION=6.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 && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
-    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
    ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \
    mkdir -p /var/lib/locales/supported.d/ && \
@ -115,9 +109,6 @@ RUN set -eux && \
    chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            gettext \
-            git && \
    apt-get -y autoremove && \
    apt-get -y clean && \
    rm -rf /var/lib/apt/lists/*
--- a/web-nginx-pgsql/alpine/Dockerfile
+++ b/web-nginx-pgsql/alpine/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
 LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \
      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 PostgreSQL database support" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -48,32 +68,7 @@ RUN set -eux && \
    rm -rf /etc/php7/php-fpm.d/www.conf && \
    rm -f /etc/nginx/http.d/*.conf && \
    ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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 && \
-    apk add --no-cache --virtual build-dependencies \
-            coreutils \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
@ -91,8 +86,6 @@ RUN set -eux && \
    chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 8080/TCP 8443/TCP
--- a/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/web-nginx-pgsql/ubuntu/Dockerfile
@ -1,14 +1,34 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

-LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)" \
+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
+ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+
+LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
      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 PostgreSQL database support" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"]
+COPY ["conf/etc/", "/etc/"]
+
 RUN set -eux && \
    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
    groupadd --system --gid 1995 zabbix && \
@ -43,7 +63,8 @@ RUN set -eux && \
    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 -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends \
+        -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install \
            curl \
            nginx \
            locales \
@ -61,38 +82,11 @@ RUN set -eux && \
    rm -rf /var/cache/nginx/ && \
    rm -f /etc/php/7.4/fpm/pool.d/www.conf && \
    ln -sf /dev/fd/2 /var/log/nginx/error.log && \
+    rm -f /etc/php/7.4/fpm/php-fpm.conf.dpkg-dist && \
    DEBIAN_FRONTEND=noninteractive apt-get -y purge gpg dirmngr gpg-agent && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ARG MAJOR_VERSION=6.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 && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            gettext \
-            git && \
-    cd /usr/share/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    mkdir /usr/share/zabbix/ && \
-    cp -R /usr/share/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \
-    rm -rf /usr/share/zabbix-${ZBX_VERSION}/ && \
    cd /usr/share/zabbix/ && \
-    ./locale/make_mo.sh && \
    rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
    rm -rf tests && \
-    rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \
    ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \
    ln -s "/etc/zabbix/web/maintenance.inc.php" "/usr/share/zabbix/conf/maintenance.inc.php" && \
    mkdir -p /var/lib/locales/supported.d/ && \
@ -115,9 +109,6 @@ RUN set -eux && \
    chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \
    chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \
    chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
-            gettext \
-            git && \
    apt-get -y autoremove && \
    apt-get -y clean && \
    rm -rf /var/lib/apt/lists/*
--- a/web-service/alpine/Dockerfile
+++ b/web-service/alpine/Dockerfile
@ -1,14 +1,32 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM alpine:3.14

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
 LABEL org.opencontainers.image.title="Zabbix web service" \
      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 servce for performing various tasks using headless web browser" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service", "/usr/sbin/zabbix_web_service"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_web_service.conf", "/etc/zabbix/zabbix_web_service.conf"]
+
 RUN set -eux && \
    addgroup --system --gid 1995 zabbix && \
    adduser --system \
@ -25,52 +43,9 @@ RUN set -eux && \
    apk add --no-cache --clean-protected \
            bash \
            chromium && \
-    rm -rf /var/cache/apk/*
-
-ARG MAJOR_VERSION=6.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}"
-
-RUN set -eux && \
-    apk add --no-cache --virtual build-dependencies \
-            autoconf \
-            automake \
-            go \
-            g++ \
-            make \
-            git \
-            pkgconf && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-webservice \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service /usr/sbin/zabbix_web_service && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_web_service.conf /etc/zabbix/zabbix_web_service.conf && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \
-    apk del --purge --no-network \
-            build-dependencies && \
    rm -rf /var/cache/apk/*

 EXPOSE 10053/TCP
--- a/web-service/ubuntu/Dockerfile
+++ b/web-service/ubuntu/Dockerfile
@ -1,14 +1,31 @@
+# syntax=docker/dockerfile:1
+ARG MAJOR_VERSION=6.0
+ARG ZBX_VERSION=${MAJOR_VERSION}
+ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION}
+ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git
+
+FROM ${BUILD_BASE_IMAGE} as builder
+
 FROM ubuntu:focal

+ARG MAJOR_VERSION
+ARG ZBX_VERSION
+ARG ZBX_SOURCES
+
 LABEL org.opencontainers.image.title="Zabbix web service" \
      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 servce for performing various tasks using headless web browser" \
-      org.opencontainers.image.licenses="GPL v2.0"
+      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="${ZBX_SOURCES}"

 STOPSIGNAL SIGTERM

+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service", "/usr/sbin/zabbix_web_service"]
+COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_web_service.conf", "/etc/zabbix/zabbix_web_service.conf"]
 COPY ["conf/etc/apt/preferences.d/chromium.pref", "/etc/apt/preferences.d/chromium.pref"]

 RUN set -eux && \
@ -41,58 +58,6 @@ RUN set -eux && \
            chromium-sandbox && \
    DEBIAN_FRONTEND=noninteractive apt-get -y purge \
            gnupg && \
-    apt-get -y autoremove && \
-    apt-get -y clean && \
-    rm -rf /var/lib/apt/lists/* 
-
-ARG MAJOR_VERSION=6.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}"
-
-RUN set -eux && \
-    apt-get -y update && \
-    DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-            autoconf \
-            automake \
-            make \
-            pkg-config \
-            git \
-            g++ \
-            golang && \
-    cd /tmp/ && \
-    git -c advice.detachedHead=false clone ${ZBX_SOURCES} --branch master --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
-    cd /tmp/zabbix-${ZBX_VERSION} && \
-    zabbix_revision=`git rev-parse --short HEAD` && \
-    sed -i "s/{ZABBIX_REVISION}/$zabbix_revision/g" src/go/pkg/version/version.go && \
-    ./bootstrap.sh && \
-    export CFLAGS="-fPIC -pie -Wl,-z,relro -Wl,-z,now" && \
-    ./configure \
-            --datadir=/usr/lib \
-            --libdir=/usr/lib/zabbix \
-            --prefix=/usr \
-            --sysconfdir=/etc/zabbix \
-            --prefix=/usr \
-            --enable-webservice \
-            --silent && \
-    make -j"$(nproc)" -s && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/go/bin/zabbix_web_service /usr/sbin/zabbix_web_service && \
-    cp /tmp/zabbix-${ZBX_VERSION}/src/go/conf/zabbix_web_service.conf /etc/zabbix/zabbix_web_service.conf && \
-    cd /tmp/ && \
-    rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \
-    apt-get -y purge \
-            autoconf \
-            automake \
-            make \
-            pkg-config \
-            git \
-            g++ \
-            golang && \ 
    chown --quiet -R zabbix:root /etc/zabbix/ /var/lib/zabbix/ && \
    chgrp -R 0 /etc/zabbix/ /var/lib/zabbix/ && \
    chmod -R g=u /etc/zabbix/ /var/lib/zabbix/ && \