Fixed ARM on CentOS and Ubuntu images

kailongapple · Dec 30, 2020 · 45fadc8 · 45fadc8
1 parent 8f2bcc4
commit 45fadc8
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 26 deletions.
diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile
@@ -12,6 +12,16 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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; \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \
@@ -31,8 +41,8 @@ RUN set -eux && \
             libldap \
             libcurl \
             openssl-libs && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile
@@ -12,7 +12,17 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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 \
             --system --comment "Zabbix monitoring system" \
@@ -37,8 +47,8 @@ RUN set -eux && \
             libssl1.1 \
             libcurl4 \
             libldap-2.4 && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="Zabbix Java Gateway" \
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
+    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \

diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile
@@ -12,6 +12,16 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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; \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \
@@ -46,8 +56,8 @@ RUN set -eux && \
             openssl-libs \
             pcre \
             unixODBC && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile
@@ -12,7 +12,17 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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 \
             --system --comment "Zabbix monitoring system" \
@@ -52,8 +62,8 @@ RUN set -eux && \
             mysql-client \
             snmp-mibs-downloader \
             unixodbc && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile
@@ -12,6 +12,16 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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; \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \
@@ -45,8 +55,8 @@ RUN set -eux && \
             openssl-libs \
             pcre \
             unixODBC && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile
@@ -12,7 +12,17 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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 \
             --system --comment "Zabbix monitoring system" \
@@ -50,8 +60,8 @@ RUN set -eux && \
             libxml2 \
             snmp-mibs-downloader \
             unixodbc && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile
@@ -12,6 +12,16 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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; \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \
@@ -52,8 +62,8 @@ RUN set -eux && \
             openssl-libs \
             pcre \
             unixODBC && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile
@@ -12,6 +12,17 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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 \
             --system --comment "Zabbix monitoring system" \
@@ -57,8 +68,8 @@ RUN set -eux && \
             mysql-client \
             snmp-mibs-downloader \
             unixodbc && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile
@@ -12,6 +12,16 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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; \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \
@@ -53,8 +63,8 @@ RUN set -eux && \
             postgresql \
             postgresql-libs \
             unixODBC && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile
@@ -12,6 +12,17 @@ STOPSIGNAL SIGTERM
 ENV TINI_VERSION=v0.19.0
 
 RUN set -eux && \
+    ARCH_SUFFIX="$(arch)"; \
+    case "$ARCH_SUFFIX" in \
+        i686) export ARCH_SUFFIX='i386' ;; \
+        x86_64) [ -f /lib/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 \
             --system --comment "Zabbix monitoring system" \
@@ -57,8 +68,8 @@ RUN set -eux && \
             postgresql-client \
             snmp-mibs-downloader \
             unixodbc && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" -o /sbin/tini && \
-    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc" -o /tmp/tini.asc && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}" -o /sbin/tini && \
+    curl -L "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${ARCH_SUFFIX}.asc" -o /tmp/tini.asc && \
     export GNUPGHOME="$(mktemp -d)" && \
     for server in $(shuf -e ha.pool.sks-keyservers.net \
                             hkp://p80.pool.sks-keyservers.net:80 \

diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, MySQL)" \
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
+    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \

diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="Zabbix web-interface (Apache, PostgreSQL)"
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
-    echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
+    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \

diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile
@@ -10,6 +10,7 @@ LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, MySQL)" \
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
+    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \

diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile
@@ -10,6 +10,7 @@ LABEL org.opencontainers.image.title="Zabbix web-interface (Nginx, PostgreSQL)"
 STOPSIGNAL SIGTERM
 
 RUN set -eux && \
+    echo "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d && \
     groupadd --system --gid 1995 zabbix && \
     useradd \
             --system --comment "Zabbix monitoring system" \