review + rebase

mmatur · mmatur · commit 69791a7090b9 · 2026-03-12T17:20:52.000+01:00
diff --git a/tmpl/alpine/tmplv1.Dockerfile b/tmpl/alpine/tmplv1.Dockerfile
@@ -4,7 +4,6 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='arm' ;; \
-    		armv7) arch="$apkArch" ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
diff --git a/tmpl/alpine/tmplv2.Dockerfile b/tmpl/alpine/tmplv2.Dockerfile
@@ -4,7 +4,7 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
+        armv7) arch='armv7' ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/tmpl/alpine/tmplv3.Dockerfile b/tmpl/alpine/tmplv3.Dockerfile
@@ -4,7 +4,7 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
+        armv7) arch='armv7' ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v2.11/alpine/Dockerfile b/v2.11/alpine/Dockerfile
@@ -4,7 +4,7 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
+        armv7) arch='armv7' ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v3.0/alpine/Dockerfile b/v3.0/alpine/Dockerfile
@@ -4,7 +4,6 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v3.1/alpine/Dockerfile b/v3.1/alpine/Dockerfile
@@ -4,7 +4,6 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v3.2/alpine/Dockerfile b/v3.2/alpine/Dockerfile
@@ -4,7 +4,6 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v3.4/alpine/Dockerfile b/v3.4/alpine/Dockerfile
@@ -4,7 +4,6 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v3.5/alpine/Dockerfile b/v3.5/alpine/Dockerfile
@@ -4,7 +4,6 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
-    		armv7) arch="$apkArch" ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v3.6/alpine/Dockerfile b/v3.6/alpine/Dockerfile
@@ -4,6 +4,7 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
+        armv7) arch='armv7' ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
diff --git a/v3.7/alpine/Dockerfile b/v3.7/alpine/Dockerfile
@@ -4,6 +4,7 @@ RUN set -ex; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		armhf) arch='armv6' ;; \
+        armv7) arch='armv7' ;; \
 		aarch64) arch='arm64' ;; \
 		x86_64) arch='amd64' ;; \
 		riscv64) arch='riscv64' ;; \
