From bd5257315a83e80b4a443c522c8178b34729bc0e Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 31 Dec 2020 00:46:56 +0200 Subject: [PATCH] Fixed ARM on CentOS and Ubuntu images --- agent/centos/Dockerfile | 2 +- proxy-mysql/centos/Dockerfile | 2 +- proxy-sqlite3/centos/Dockerfile | 2 +- server-mysql/centos/Dockerfile | 2 +- server-pgsql/centos/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index 846768143..6188cf950 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -15,7 +15,7 @@ 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' ;; \ + x86_64) [ -f /lib64/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' ;; \ diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 6f3dd912b..d09e5b2ea 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -15,7 +15,7 @@ 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' ;; \ + x86_64) [ -f /lib64/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' ;; \ diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 61486fbcc..08cc5af8f 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -15,7 +15,7 @@ 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' ;; \ + x86_64) [ -f /lib64/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' ;; \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index ffe07e476..c3f16a958 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -15,7 +15,7 @@ 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' ;; \ + x86_64) [ -f /lib64/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' ;; \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index c34aa32d3..de7937cf9 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -15,7 +15,7 @@ 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' ;; \ + x86_64) [ -f /lib64/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' ;; \