From f40f4369a1014087183dc9eb7fa1e224fbd3f717 Mon Sep 17 00:00:00 2001 From: Tariq Ibrahim Date: Wed, 28 Feb 2024 11:43:48 -0800 Subject: [PATCH] Fix dockerfile arch selection This change includes an arm64 arch check when installing golang. Signed-off-by: Tariq Ibrahim Signed-off-by: Evan Lezar --- build/container/Dockerfile.centos | 2 +- build/container/Dockerfile.ubuntu | 2 +- docker/Dockerfile.debian | 2 +- docker/Dockerfile.opensuse-leap | 2 +- docker/Dockerfile.rpm-yum | 2 +- docker/Dockerfile.ubuntu | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/container/Dockerfile.centos b/build/container/Dockerfile.centos index 3250c425..96b943ea 100644 --- a/build/container/Dockerfile.centos +++ b/build/container/Dockerfile.centos @@ -31,7 +31,7 @@ RUN set -eux; \ case "${arch##*-}" in \ x86_64 | amd64) ARCH='amd64' ;; \ ppc64el | ppc64le) ARCH='ppc64le' ;; \ - aarch64) ARCH='arm64' ;; \ + aarch64 | arm64) ARCH='arm64' ;; \ *) echo "unsupported architecture" ; exit 1 ;; \ esac; \ wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \ diff --git a/build/container/Dockerfile.ubuntu b/build/container/Dockerfile.ubuntu index 9d8108b4..dd50f883 100644 --- a/build/container/Dockerfile.ubuntu +++ b/build/container/Dockerfile.ubuntu @@ -31,7 +31,7 @@ RUN set -eux; \ case "${arch##*-}" in \ x86_64 | amd64) ARCH='amd64' ;; \ ppc64el | ppc64le) ARCH='ppc64le' ;; \ - aarch64) ARCH='arm64' ;; \ + aarch64 | arm64) ARCH='arm64' ;; \ *) echo "unsupported architecture" ; exit 1 ;; \ esac; \ wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \ diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index df576af7..4b3c535f 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -22,7 +22,7 @@ RUN set -eux; \ case "${arch##*-}" in \ x86_64 | amd64) ARCH='amd64' ;; \ ppc64el | ppc64le) ARCH='ppc64le' ;; \ - aarch64) ARCH='arm64' ;; \ + aarch64 | arm64) ARCH='arm64' ;; \ *) echo "unsupported architecture" ; exit 1 ;; \ esac; \ wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \ diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap index 3de7a392..f1ce31ec 100644 --- a/docker/Dockerfile.opensuse-leap +++ b/docker/Dockerfile.opensuse-leap @@ -15,7 +15,7 @@ RUN set -eux; \ case "${arch##*-}" in \ x86_64 | amd64) ARCH='amd64' ;; \ ppc64el | ppc64le) ARCH='ppc64le' ;; \ - aarch64) ARCH='arm64' ;; \ + aarch64 | arm64) ARCH='arm64' ;; \ *) echo "unsupported architecture"; exit 1 ;; \ esac; \ wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \ diff --git a/docker/Dockerfile.rpm-yum b/docker/Dockerfile.rpm-yum index 4f3e248f..472c3384 100644 --- a/docker/Dockerfile.rpm-yum +++ b/docker/Dockerfile.rpm-yum @@ -33,7 +33,7 @@ RUN set -eux; \ case "${arch##*-}" in \ x86_64 | amd64) ARCH='amd64' ;; \ ppc64el | ppc64le) ARCH='ppc64le' ;; \ - aarch64) ARCH='arm64' ;; \ + aarch64 | arm64) ARCH='arm64' ;; \ *) echo "unsupported architecture"; exit 1 ;; \ esac; \ wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \ diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 674d74a4..cfa930bb 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -20,7 +20,7 @@ RUN set -eux; \ case "${arch##*-}" in \ x86_64 | amd64) ARCH='amd64' ;; \ ppc64el | ppc64le) ARCH='ppc64le' ;; \ - aarch64) ARCH='arm64' ;; \ + aarch64 | arm64) ARCH='arm64' ;; \ *) echo "unsupported architecture" ; exit 1 ;; \ esac; \ wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \