p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch armhf images to arm32v7

Browse Source 
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 <github@gone.nl>
Upstream-commit: 2b8d4afddf118b809157f4249a45656cfaa96cd3
Component: packaging
This commit is contained in:
Sebastiaan van Stijn
2017-09-15 18:32:40 +02:00
parent 7f5ba34576
commit 4609e2004f
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/packaging/deb/debian-jessie/Dockerfile.armv7l
View File

@ -1,4 +1,4 @@
FROM armhf/debian:jessie
FROM arm32v7/debian:jessie
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org

2
components/packaging/deb/debian-stretch/Dockerfile.armv7l
View File

@ -1,4 +1,4 @@
FROM armhf/debian:stretch
FROM arm32v7/debian:stretch
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org

2
components/packaging/deb/ubuntu-trusty/Dockerfile.armv7l
View File

@ -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/*

2
components/packaging/deb/ubuntu-xenial/Dockerfile.armv7l
View File

@ -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/*

2
components/packaging/deb/ubuntu-zesty/Dockerfile.armv7l
View File

@ -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/*

2
components/packaging/detect_alpine_image
View File

@ -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