Fixed issue with init (PID 1)

2024-12-31 10:49:06 +01:00 · 2019-04-09 22:43:56 +03:00 · 2019-04-09 22:43:56 +03:00 · ec52185af3
commit ec52185af3
parent c844b5c09d
29 changed files with 155 additions and 96 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+zbx_env/
--- a/agent/alpine/Dockerfile
+++ b/agent/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.4 as builder
+FROM alpine:3.9 as builder

 ARG APK_FLAGS_COMMON=""
 ARG APK_FLAGS_DEV="${APK_FLAGS_COMMON} --no-cache"
@ -38,7 +38,7 @@ RUN apk update && \
            --silent && \
    make -j"$(nproc)" -s

-FROM alpine:3.4
+FROM alpine:3.9
 LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
@ -86,6 +86,7 @@ RUN addgroup zabbix && \
    chown --quiet -R zabbix:root /var/lib/zabbix && \
    apk update && \
    apk add ${APK_FLAGS_PERSISTANT} \
+            tini \
            bash \
            coreutils \
            iputils \
@ -100,4 +101,6 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/agent/centos/Dockerfile
+++ b/agent/centos/Dockerfile
@ -52,6 +52,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}
 ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV TERM=xterm ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
    ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-centos" \
      org.label-schema.vendor="Zabbix LLC" \
@ -72,6 +73,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /u
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
 COPY --from=builder  /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN groupadd --system zabbix && \
    adduser -r --shell /sbin/nologin \
@ -89,7 +91,8 @@ RUN groupadd --system zabbix && \
            libldap \
            openssl-libs && \
    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum
+    rm -rf /var/cache/yum && \
+    chmod +x /sbin/tini

 EXPOSE 10050/TCP

@ -99,4 +102,6 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/agent/ubuntu/Dockerfile
+++ b/agent/ubuntu/Dockerfile
@ -56,6 +56,7 @@ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
    ZBX_TYPE=agent ZBX_DB_TYPE=none ZBX_OPT_TYPE=none \
    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES}
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-ubuntu" \
      org.label-schema.vendor="Zabbix LLC" \
@ -76,6 +77,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_agent/zabbix_agentd /u
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bin/zabbix_get
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
 COPY --from=builder  /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_agentd.conf /etc/zabbix/zabbix_agentd.conf
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN apt-get ${APT_FLAGS_COMMON} update && \
    apt-get ${APT_FLAGS_PERSISTENT} install locales && \
@ -99,7 +101,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
            libldap-2.4 && \
    apt-get ${APT_FLAGS_COMMON} autoremove && \
    apt-get ${APT_FLAGS_COMMON} clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/*  && \
+    chmod +x /sbin/tini

 EXPOSE 10050/TCP

@ -109,4 +112,6 @@ VOLUME ["/etc/zabbix/zabbix_agentd.d", "/var/lib/zabbix/enc", "/var/lib/zabbix/m

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/docker-compose_v3_alpine_mysql_local.yaml
+++ b/docker-compose_v3_alpine_mysql_local.yaml
@ -69,7 +69,7 @@ services:
  build:
   context: ./proxy-sqlite3/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-proxy-sqlite3:alpine-local
  ports:
   - "10061:10051"
@ -291,7 +291,7 @@ services:
  build:
   context: ./agent/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-agent:alpine-local
  ports:
   - "10050:10050"
@ -335,7 +335,7 @@ services:
  build:
   context: ./java-gateway/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-java-gateway:alpine-local
  ports:
   - "10052:10052"
@ -366,7 +366,7 @@ services:
  build:
   context: ./snmptraps/alpine
   cache_from:
-    - alpine:3.7
+    - alpine:3.9
  image: zabbix-snmptraps:alpine-local
  ports:
   - "162:162/udp"
--- a/docker-compose_v3_alpine_pgsql_local.yaml
+++ b/docker-compose_v3_alpine_pgsql_local.yaml
@ -4,7 +4,7 @@ services:
  build:
   context: ./server-pgsql/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-server-pgsql:alpine-local
  ports:
   - "10051:10051"
@ -69,7 +69,7 @@ services:
  build:
   context: ./proxy-sqlite3/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-proxy-sqlite3:alpine-local
  ports:
   - "10061:10051"
@ -182,7 +182,7 @@ services:
  build:
   context: ./web-apache-pgsql/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-web-apache-pgsql:alpine-local
  ports:
   - "80:80"
@ -237,7 +237,7 @@ services:
  build:
   context: ./web-nginx-pgsql/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-web-nginx-pgsql:alpine-local
  ports:
   - "8081:80"
@ -292,7 +292,7 @@ services:
  build:
   context: ./agent/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-agent:alpine-local
  ports:
   - "10050:10050"
@ -336,7 +336,7 @@ services:
  build:
   context: ./java-gateway/alpine
   cache_from:
-    - alpine:3.4
+    - alpine:3.9
  image: zabbix-java-gateway:alpine-local
  ports:
   - "10052:10052"
--- a/docker-compose_v3_ubuntu_mysql_latest.yaml
+++ b/docker-compose_v3_ubuntu_mysql_latest.yaml
@ -5,8 +5,7 @@ services:
  ports:
   - "10051:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
@ -66,8 +65,7 @@ services:
  ports:
   - "10061:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -117,8 +115,7 @@ services:
  ports:
   - "10071:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -174,8 +171,7 @@ services:
   - mysql-server:mysql-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
  deploy:
   resources:
@ -225,8 +221,7 @@ services:
   - mysql-server:mysql-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
  deploy:
   resources:
@ -272,8 +267,7 @@ services:
  ports:
   - "10050:10050"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
--- a/docker-compose_v3_ubuntu_mysql_local.yaml
+++ b/docker-compose_v3_ubuntu_mysql_local.yaml
@ -9,8 +9,7 @@ services:
  ports:
   - "10051:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
@ -74,8 +73,7 @@ services:
  ports:
   - "10061:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -129,8 +127,7 @@ services:
  ports:
   - "10071:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -190,8 +187,7 @@ services:
   - mysql-server:mysql-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
  deploy:
   resources:
@ -245,8 +241,7 @@ services:
   - mysql-server:mysql-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
  deploy:
   resources:
@ -296,8 +291,7 @@ services:
  ports:
   - "10050:10050"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
--- a/docker-compose_v3_ubuntu_pgsql_latest.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_latest.yaml
@ -5,8 +5,7 @@ services:
  ports:
   - "10051:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
@ -66,8 +65,7 @@ services:
  ports:
   - "10061:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -117,8 +115,7 @@ services:
  ports:
   - "10071:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -174,8 +171,7 @@ services:
   - postgres-server:postgres-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
  deploy:
   resources:
@ -225,8 +221,7 @@ services:
   - postgres-server:postgres-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
  deploy:
   resources:
@ -272,8 +267,7 @@ services:
  ports:
   - "10050:10050"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
--- a/docker-compose_v3_ubuntu_pgsql_local.yaml
+++ b/docker-compose_v3_ubuntu_pgsql_local.yaml
@ -6,8 +6,7 @@ services:
  ports:
   - "10051:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
@ -68,8 +67,7 @@ services:
  ports:
   - "10061:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -120,8 +118,7 @@ services:
  ports:
   - "10071:10051"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro 
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
@ -179,8 +176,7 @@ services:
   - postgres-server:postgres-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/apache2:/etc/ssl/apache2:ro
  deploy:
   resources:
@ -231,8 +227,7 @@ services:
   - postgres-server:postgres-server
   - zabbix-server:zabbix-server
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
  deploy:
   resources:
@ -279,8 +274,7 @@ services:
  ports:
   - "10050:10050"
  volumes:
-#   - /etc/localtime:/etc/localtime:ro
-#   - /etc/timezone:/etc/timezone:ro
+   - /etc/localtime:/etc/localtime:ro
   - ./zbx_env/etc/zabbix/zabbix_agentd.d:/etc/zabbix/zabbix_agentd.d:ro
   - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
   - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
--- a/java-gateway/alpine/Dockerfile
+++ b/java-gateway/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.9
 LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- a/proxy-mysql/alpine/Dockerfile
+++ b/proxy-mysql/alpine/Dockerfile
@ -42,6 +42,7 @@ RUN addgroup zabbix && \
    mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
    apk update && \
    apk add ${APK_FLAGS_PERSISTENT} \
+            tini \
            bash \
            iputils \
            libcurl \
@ -131,4 +132,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/proxy-mysql/centos/Dockerfile
+++ b/proxy-mysql/centos/Dockerfile
@ -69,6 +69,7 @@ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
    ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
      org.label-schema.vendor="Zabbix LLC" \
@ -90,6 +91,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bi
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN groupadd --system zabbix && \
    adduser -r --shell /sbin/nologin \
@ -123,7 +125,8 @@ RUN groupadd --system zabbix && \
            pcre \
            unixODBC && \
    yum ${YUM_FLAGS_PERSISTANT} clean all && \
-    rm -rf /var/cache/yum/
+    rm -rf /var/cache/yum/ && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -134,4 +137,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/proxy-mysql/ubuntu/Dockerfile
+++ b/proxy-mysql/ubuntu/Dockerfile
@ -11,6 +11,7 @@ ARG DB_TYPE=mysql
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_TYPE=proxy ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
      org.label-schema.vendor="Zabbix LLC" \
@ -74,6 +75,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
      org.label-schema.vcs-url="${ZBX_SOURCES}" \
      org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql --link zabbix-server:zabbix-server -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"

+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
+
 RUN apt-get ${APT_FLAGS_COMMON} update && \
    apt-get ${APT_FLAGS_DEV} install \
            autoconf \
@ -146,7 +149,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
            unixodbc-dev && \
    apt-get ${APT_FLAGS_COMMON} autoremove && \
    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /root/.subversion
+    rm -rf /root/.subversion && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -157,4 +161,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi
      
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/proxy-sqlite3/alpine/Dockerfile
+++ b/proxy-sqlite3/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.9
 LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
@ -41,6 +41,7 @@ RUN addgroup zabbix && \
    chown --quiet -R zabbix:root /var/lib/zabbix && \
    apk update && \
    apk add ${APK_FLAGS_PERSISTENT} \
+            tini \
            bash \
            fping \
            iputils \
@ -126,4 +127,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/proxy-sqlite3/centos/Dockerfile
+++ b/proxy-sqlite3/centos/Dockerfile
@ -69,6 +69,7 @@ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
    ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
      org.label-schema.vendor="Zabbix LLC" \
@ -90,6 +91,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bi
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN groupadd --system zabbix && \
    adduser -r --shell /sbin/nologin \
@ -122,7 +124,8 @@ RUN groupadd --system zabbix && \
            pcre \
            unixODBC && \
    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/
+    rm -rf /var/cache/yum/ && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -133,4 +136,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/proxy-sqlite3/ubuntu/Dockerfile
+++ b/proxy-sqlite3/ubuntu/Dockerfile
@ -10,6 +10,7 @@ ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_TYPE=proxy ZBX_DB_TYPE=sqlite3 ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
      org.label-schema.vendor="Zabbix LLC" \
@ -71,6 +72,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
      org.label-schema.vcs-url="${ZBX_SOURCES}" \
      org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link zabbix-server:zabbix-server -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"

+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
+
 RUN apt-get ${APT_FLAGS_COMMON} update && \
    apt-get ${APT_FLAGS_DEV} install \
            autoconf \
@ -140,7 +143,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
            unixodbc-dev && \
    apt-get ${APT_FLAGS_COMMON} autoremove && \
    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /root/.subversion
+    rm -rf /root/.subversion && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -151,4 +155,6 @@ VOLUME ["/var/lib/zabbix/ssh_keys", "/var/lib/zabbix/ssl/certs", "/var/lib/zabbi
      
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/server-mysql/alpine/Dockerfile
+++ b/server-mysql/alpine/Dockerfile
@ -44,6 +44,7 @@ RUN addgroup zabbix && \
    mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
    apk update && \
    apk add ${APK_FLAGS_PERSISTENT} \
+            tini \
            bash \
            fping \
            iputils \
@ -137,4 +138,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/server-mysql/centos/Dockerfile
+++ b/server-mysql/centos/Dockerfile
@ -74,6 +74,7 @@ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
    TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
      org.label-schema.vendor="Zabbix LLC" \
@ -95,6 +96,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bi
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN groupadd --system zabbix && \
    adduser -r --shell /sbin/nologin \
@ -132,7 +134,8 @@ RUN groupadd --system zabbix && \
            pcre \
            unixODBC && \
    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/
+    rm -rf /var/cache/yum/ && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -143,4 +146,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi
      
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/server-mysql/ubuntu/Dockerfile
+++ b/server-mysql/ubuntu/Dockerfile
@ -10,6 +10,7 @@ ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
      org.label-schema.vendor="Zabbix LLC" \
@ -78,6 +79,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
      org.label-schema.vcs-url="${ZBX_SOURCES}" \
      org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} --link mysql-server:mysql -p 10051:10051 -d zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}:ubuntu-${ZBX_VERSION}"

+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
+
 RUN apt-get ${APT_FLAGS_COMMON} update && \
    apt-get ${APT_FLAGS_DEV} install \
            autoconf \
@ -155,7 +158,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
            unixodbc-dev && \
    apt-get ${APT_FLAGS_COMMON} autoremove && \
    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /root/.subversion
+    rm -rf /root/.subversion && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -166,4 +170,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi
      
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/server-pgsql/alpine/Dockerfile
+++ b/server-pgsql/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:3.9
 LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
@ -44,6 +44,7 @@ RUN addgroup zabbix && \
    mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE} && \
    apk update && \
    apk add ${APK_FLAGS_PERSISTENT} \
+            tini \
            bash \
            fping \
            iputils \
@ -137,4 +138,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi

 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/server-pgsql/centos/Dockerfile
+++ b/server-pgsql/centos/Dockerfile
@ -74,6 +74,7 @@ ARG ZBX_SOURCES=svn://svn.zabbix.com/tags/${ZBX_VERSION}/
 ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
    TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
      org.label-schema.vendor="Zabbix LLC" \
@ -95,6 +96,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_get/zabbix_get /usr/bi
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_sender/zabbix_sender /usr/bin/zabbix_sender
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/conf/zabbix_${ZBX_TYPE}.conf /etc/zabbix/zabbix_${ZBX_TYPE}.conf
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/database/${ZBX_DB_TYPE}/create.sql.gz /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/create.sql.gz
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN groupadd --system zabbix && \
    adduser -r --shell /sbin/nologin \
@ -133,7 +135,8 @@ RUN groupadd --system zabbix && \
            postgresql-libs \
            unixODBC && \
    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/
+    rm -rf /var/cache/yum/ && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -144,4 +147,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi
      
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/server-pgsql/ubuntu/Dockerfile
+++ b/server-pgsql/ubuntu/Dockerfile
@ -10,6 +10,7 @@ ARG APT_FLAGS_DEV="${APT_FLAGS_COMMON} --no-install-recommends"
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive TERM=xterm \
    MIBDIRS=/var/lib/snmp/mibs/ietf:/var/lib/snmp/mibs/iana:/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_TYPE=server ZBX_DB_TYPE=postgresql ZBX_OPT_TYPE=none
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
      org.label-schema.vendor="Zabbix LLC" \
@ -78,6 +79,8 @@ LABEL org.label-schema.usage="https://www.zabbix.com/documentation/${MAJOR_VERSI
      org.label-schema.vcs-url="${ZBX_SOURCES}" \
      org.label-schema.docker.cmd="docker run --name zabbix-${ZBX_TYPE}-pgsql --link postgres-server:postgres -p 10051:10051 -d zabbix-${ZBX_TYPE}-pgsql:ubuntu-${ZBX_VERSION}"

+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini
+
 RUN apt-get ${APT_FLAGS_COMMON} update && \
    apt-get ${APT_FLAGS_DEV} install \
            autoconf \
@ -154,7 +157,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
            subversion \
            unixodbc-dev && \
    apt-get ${APT_FLAGS_COMMON} autoremove && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    chmod +x /sbin/tini

 EXPOSE 10051/TCP

@ -165,4 +169,6 @@ VOLUME ["/var/lib/zabbix/snmptraps", "/var/lib/zabbix/ssh_keys", "/var/lib/zabbi
      
 COPY ["docker-entrypoint.sh", "/usr/bin/"]

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/snmptraps/alpine/Dockerfile
+++ b/snmptraps/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.9
 LABEL maintainer "Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- a/web-apache-pgsql/alpine/Dockerfile
+++ b/web-apache-pgsql/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.9
 LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- a/web-nginx-pgsql/alpine/Dockerfile
+++ b/web-nginx-pgsql/alpine/Dockerfile
@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.9
 LABEL maintainer="Alexey Pustovalov <alexey.pustovalov@zabbix.com>"

 ARG BUILD_DATE
--- a/zabbix-appliance/alpine/Dockerfile
+++ b/zabbix-appliance/alpine/Dockerfile
@ -141,6 +141,7 @@ RUN addgroup zabbix && \
    ln -s /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf /usr/share/zabbix/fonts/graphfont.ttf && \
    apk update && \
    apk add ${APK_FLAGS_PERSISTENT} \
+            tini \
            bash \
            curl \
            fping \
@ -193,4 +194,6 @@ COPY ["docker-entrypoint.sh", "/usr/bin/"]

 ENV ZBX_TYPE=appliance

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/zabbix-appliance/centos/Dockerfile
+++ b/zabbix-appliance/centos/Dockerfile
@ -91,6 +91,7 @@ ENV ZBX_VERSION=${ZBX_VERSION} ZBX_SOURCES=${ZBX_SOURCES} \
    TERM=xterm MIBDIRS=/usr/share/snmp/mibs:/var/lib/zabbix/mibs MIBS=+ALL \
    ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
    MYSQL_ALLOW_EMPTY_PASSWORD=true ZBX_ADD_SERVER=true ZBX_ADD_WEB=true DB_SERVER_HOST=localhost MYSQL_USER=zabbix ZBX_ADD_JAVA_GATEWAY=true ZBX_JAVAGATEWAY_ENABLE=true ZBX_JAVAGATEWAY=localhost
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-centos" \
      org.label-schema.vendor="Zabbix LLC" \
@ -117,6 +118,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin/ /usr/sbin/za
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/ /usr/sbin/zabbix_java/lib/
      
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/frontends/php/ /usr/share/zabbix/
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN groupadd --system zabbix && \
    adduser -r --shell /sbin/nologin \
@ -174,7 +176,8 @@ RUN groupadd --system zabbix && \
                cut -d"'" -f 2 | sort | \
                xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \
    yum ${YUM_FLAGS_PERSISTENT} clean all && \
-    rm -rf /var/cache/yum/
+    rm -rf /var/cache/yum/ && \
+    chmod +x /sbin/tini

 EXPOSE 80/TCP 443/TCP 10051/TCP

@ -198,4 +201,6 @@ COPY ["docker-entrypoint.sh", "/usr/bin/"]

 ENV ZBX_TYPE=appliance

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]
--- a/zabbix-appliance/ubuntu/Dockerfile
+++ b/zabbix-appliance/ubuntu/Dockerfile
@ -97,6 +97,7 @@ ENV 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 \
    ZBX_TYPE=server ZBX_DB_TYPE=mysql ZBX_OPT_TYPE=nginx \
    MYSQL_ALLOW_EMPTY_PASSWORD=true ZBX_ADD_SERVER=true ZBX_ADD_WEB=true DB_SERVER_HOST=localhost MYSQL_USER=zabbix ZBX_ADD_JAVA_GATEWAY=true ZBX_JAVAGATEWAY_ENABLE=true ZBX_JAVAGATEWAY=localhost
+ENV TINI_VERSION v0.18.0

 LABEL org.label-schema.name="zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}-ubuntu" \
      org.label-schema.vendor="Zabbix LLC" \
@ -123,6 +124,7 @@ COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/bin/ /usr/sbin/za
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/src/zabbix_java/lib/ /usr/sbin/zabbix_java/lib/
            
 COPY --from=builder /tmp/zabbix-${ZBX_VERSION}/frontends/php/ /usr/share/zabbix/
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /sbin/tini

 RUN apt-get ${APT_FLAGS_COMMON} update && \
    apt-get ${APT_FLAGS_PERSISTENT} install locales gnupg2 && \
@ -197,7 +199,8 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \
    mkdir -p /var/lib/php7 && \
    chown --quiet -R www-data:www-data /var/lib/php7 && \
    rm -rf /var/cache/nginx/* && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    chmod +x /sbin/tini

 EXPOSE 80/TCP 443/TCP 10051/TCP

@ -220,4 +223,6 @@ COPY ["docker-entrypoint.sh", "/usr/bin/"]

 ENV ZBX_TYPE=appliance

-ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD ["docker-entrypoint.sh"]