review + rebase

Author: mmatur

v3.3/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' ;; \