From 740b6294dc812e840e9776d38558bed6f7d279eb Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 31 Dec 2020 00:25:38 +0200 Subject: [PATCH] Fixed ARM on CentOS and Ubuntu images --- agent/ubuntu/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 218b0a852..859a236ed 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/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 /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' ;; \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 15ca65e9c..ea3e8117b 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/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 /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' ;; \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index ab5c4ac58..5561c7f88 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/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 /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' ;; \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index e5d45603f..e3a73ce94 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/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 /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' ;; \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index 74123565a..ad41941a1 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/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 /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' ;; \