From 4609e2004fa8d956427d4b6f323e6dc15c1aa7a0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 15 Sep 2017 18:32:40 +0200 Subject: [PATCH] Switch armhf images to arm32v7 The "armhf" images on Docker Hub are deprecated in favor of the "arm32v7" and "arm32v6" images. Note that the Alpine image is built for arm32v6, which is compatible for both arm32v6 and arm32v7. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 2b8d4afddf118b809157f4249a45656cfaa96cd3 Component: packaging --- components/packaging/deb/debian-jessie/Dockerfile.armv7l | 2 +- components/packaging/deb/debian-stretch/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l | 2 +- components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l | 2 +- components/packaging/detect_alpine_image | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/packaging/deb/debian-jessie/Dockerfile.armv7l b/components/packaging/deb/debian-jessie/Dockerfile.armv7l index 6bebacabf2..12426ddaf5 100644 --- a/components/packaging/deb/debian-jessie/Dockerfile.armv7l +++ b/components/packaging/deb/debian-jessie/Dockerfile.armv7l @@ -1,4 +1,4 @@ -FROM armhf/debian:jessie +FROM arm32v7/debian:jessie # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org diff --git a/components/packaging/deb/debian-stretch/Dockerfile.armv7l b/components/packaging/deb/debian-stretch/Dockerfile.armv7l index f173cfd465..27edd03182 100644 --- a/components/packaging/deb/debian-stretch/Dockerfile.armv7l +++ b/components/packaging/deb/debian-stretch/Dockerfile.armv7l @@ -1,4 +1,4 @@ -FROM armhf/debian:stretch +FROM arm32v7/debian:stretch # allow replacing httpredir or deb mirror ARG APT_MIRROR=deb.debian.org diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l index b39912c706..8b414afc9b 100644 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l @@ -1,4 +1,4 @@ -FROM armhf/ubuntu:trusty +FROM arm32v7/ubuntu:trusty RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l index d51ffa6b52..39c83c45b0 100644 --- a/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l @@ -1,4 +1,4 @@ -FROM armhf/ubuntu:xenial +FROM arm32v7/ubuntu:xenial RUN apt-get update && apt-get install -y 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/deb/ubuntu-zesty/Dockerfile.armv7l b/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l index 670e8f1d6c..3a5f9d23c0 100644 --- a/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l +++ b/components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l @@ -1,4 +1,4 @@ -FROM armhf/ubuntu:zesty +FROM arm32v7/ubuntu:zesty RUN apt-get update && apt-get install -y 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..06ec609e7e 100755 --- a/components/packaging/detect_alpine_image +++ b/components/packaging/detect_alpine_image @@ -6,7 +6,7 @@ img="unknown" if [ "$arch" = "x86_64" ]; then img="alpine" elif [ "$arch" = "armv7l" ]; then - img="armhf/alpine" + img="arm32v6/alpine" elif [ "$arch" = "s390x" ]; then img="s390x/alpine" elif [ "$arch" = "aarch64" ]; then