From e0f6b9f1403969e0f2e2b0e668cef04a5fcc08df Mon Sep 17 00:00:00 2001
From: Olliver Schinagl <oliver@schinagl.nl>
Date: Mon, 4 Feb 2019 08:23:51 +0100
Subject: [PATCH] Start supporting arm32v7 armv7

With alpine 3.9 out the door, and it now officially supporting armv7
(http://dl-cdn.alpinelinux.org/alpine/v3.9/main/armv7/)
also start creating docker builds for it.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
---
 build                                  |   3 ++-
 versions/library-3.9/armv7/Dockerfile  |   5 +++++
 versions/library-3.9/armv7/UTC         | Bin 0 -> 127 bytes
 versions/library-3.9/armv7/options     |   4 ++++
 versions/library-edge/armv7/Dockerfile |   5 +++++
 versions/library-edge/armv7/UTC        | Bin 0 -> 127 bytes
 versions/library-edge/armv7/options    |   4 ++++
 7 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 versions/library-3.9/armv7/Dockerfile
 create mode 100644 versions/library-3.9/armv7/UTC
 create mode 100644 versions/library-3.9/armv7/options
 create mode 100644 versions/library-edge/armv7/Dockerfile
 create mode 100644 versions/library-edge/armv7/UTC
 create mode 100644 versions/library-edge/armv7/options

diff --git a/build b/build
index cb73a485..1819c017 100755
--- a/build
+++ b/build
@@ -122,7 +122,8 @@ library() {
 			case "$arch" in # converts Alpine Linux arch strings to Docker arch strings
 				x86_64) echo -n "amd64";;
 				x86) echo -n "i386";;
-				armhf) echo -n "arm32v6";; # arm32v7 is not officially supported by Alpine, but arm32v6 should still work.
+				armhf) echo -n "arm32v6";;
+				armv7) echo -n "arm32v7";;
 				aarch64) echo -n "arm64v8";;
 				ppc64le) echo -n "ppc64le";;
 				s390x) echo -n "s390x";;
diff --git a/versions/library-3.9/armv7/Dockerfile b/versions/library-3.9/armv7/Dockerfile
new file mode 100644
index 00000000..529f892f
--- /dev/null
+++ b/versions/library-3.9/armv7/Dockerfile
@@ -0,0 +1,5 @@
+FROM scratch
+ADD rootfs.tar.gz /
+# ensure UTC instead of the default GMT
+COPY UTC /etc/localtime
+CMD ["/bin/sh"]
diff --git a/versions/library-3.9/armv7/UTC b/versions/library-3.9/armv7/UTC
new file mode 100644
index 0000000000000000000000000000000000000000..c3b97f1a199421d6d9625b280316d99b85a4a4e8
GIT binary patch
literal 127
ucmWHE%1kq2zyORu5fFv}5Ss<U2@P=uGC~OJgPFnd17-@c0bD?H47dQg2nTKe

literal 0
HcmV?d00001

diff --git a/versions/library-3.9/armv7/options b/versions/library-3.9/armv7/options
new file mode 100644
index 00000000..cd473d41
--- /dev/null
+++ b/versions/library-3.9/armv7/options
@@ -0,0 +1,4 @@
+version=3.9.0
+export ARCH="armv7"
+export PULL_URL="http://dl-cdn.alpinelinux.org/alpine/v${version%.*}/releases/${ARCH}/alpine-minirootfs-${version}-${ARCH}.tar.gz"
+export TAGS=(alpine:${version%.*}-${ARCH})
diff --git a/versions/library-edge/armv7/Dockerfile b/versions/library-edge/armv7/Dockerfile
new file mode 100644
index 00000000..529f892f
--- /dev/null
+++ b/versions/library-edge/armv7/Dockerfile
@@ -0,0 +1,5 @@
+FROM scratch
+ADD rootfs.tar.gz /
+# ensure UTC instead of the default GMT
+COPY UTC /etc/localtime
+CMD ["/bin/sh"]
diff --git a/versions/library-edge/armv7/UTC b/versions/library-edge/armv7/UTC
new file mode 100644
index 0000000000000000000000000000000000000000..c3b97f1a199421d6d9625b280316d99b85a4a4e8
GIT binary patch
literal 127
ucmWHE%1kq2zyORu5fFv}5Ss<U2@P=uGC~OJgPFnd17-@c0bD?H47dQg2nTKe

literal 0
HcmV?d00001

diff --git a/versions/library-edge/armv7/options b/versions/library-edge/armv7/options
new file mode 100644
index 00000000..54c24450
--- /dev/null
+++ b/versions/library-edge/armv7/options
@@ -0,0 +1,4 @@
+fs_version=3.7.0
+export ARCH="armv7"
+export PULL_URL="http://dl-cdn.alpinelinux.org/alpine/edge/releases/${ARCH}/alpine-minirootfs-${fs_version}-${ARCH}.tar.gz"
+export TAGS=(alpine:edge-${ARCH})