From 35f91d208ef3bc48540e16d95eb6566f036f769f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 16 Sep 2017 03:10:07 +0200 Subject: [PATCH] Switch aarch64 images to arm64v8 The "aarch64" images on Docker Hub are deprecated in favor of the "arm64v8" images. Signed-off-by: Sebastiaan van Stijn Upstream-commit: cc436770b773767ad59e766be66323282b030d33 Component: packaging --- components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 | 2 +- components/packaging/detect_alpine_image | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 index fd2ca681d2..cfa8db3e65 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM aarch64/ubuntu:xenial +FROM arm64v8/ubuntu:xenial RUN apt-get update && apt-get install -y golang-go apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* diff --git a/components/packaging/detect_alpine_image b/components/packaging/detect_alpine_image index 756e7dd550..a662599748 100755 --- a/components/packaging/detect_alpine_image +++ b/components/packaging/detect_alpine_image @@ -10,7 +10,7 @@ elif [ "$arch" = "armv7l" ]; then elif [ "$arch" = "s390x" ]; then img="s390x/alpine" elif [ "$arch" = "aarch64" ]; then - img="aarch64/alpine" + img="arm64v8/alpine" elif [ "$arch" = "ppc64le" ]; then img="ppc64le/alpine" else