From ca9cc692e40e9e216c252330dc5529950e8dd3e8 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Sun, 22 Sep 2019 10:16:59 -0700
Subject: Add Docker image variant for arm32v7

---
 Dockerfile | 2 +-
 Makefile   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ebf8fd5..439ef8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12-alpine3.10 as build
+FROM golang:1.13-alpine3.10 as build
 ENV GO111MODULE=on
 WORKDIR /go/src/app
 RUN apk add --no-cache --update build-base git
diff --git a/Makefile b/Makefile
index c334398..7e5af7c 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,7 @@ docker-images:
 	  case $${arch} in \
 		amd64   ) miniflux_arch="amd64";; \
 		arm32v6 ) miniflux_arch="armv6";; \
+		arm32v7 ) miniflux_arch="armv7";; \
 		arm64v8 ) miniflux_arch="armv8";; \
 	  esac ;\
 	  cp Dockerfile Dockerfile.$${arch} && \
@@ -137,13 +138,17 @@ docker-manifest:
 	for version in $(VERSION) latest; do \
 		docker push $(DOCKER_IMAGE):amd64-$${version} && \
 		docker push $(DOCKER_IMAGE):arm32v6-$${version} && \
+		docker push $(DOCKER_IMAGE):arm32v7-$${version} && \
 		docker push $(DOCKER_IMAGE):arm64v8-$${version} && \
 		docker manifest create --amend $(DOCKER_IMAGE):$${version} \
 			$(DOCKER_IMAGE):amd64-$${version} \
 			$(DOCKER_IMAGE):arm32v6-$${version} \
+			$(DOCKER_IMAGE):arm32v7-$${version} \
 			$(DOCKER_IMAGE):arm64v8-$${version} && \
 		docker manifest annotate $(DOCKER_IMAGE):$${version} \
 			$(DOCKER_IMAGE):arm32v6-$${version} --os linux --arch arm --variant v6 && \
+		docker manifest annotate $(DOCKER_IMAGE):$${version} \
+			$(DOCKER_IMAGE):arm32v7-$${version} --os linux --arch arm --variant v7 && \
 		docker manifest annotate $(DOCKER_IMAGE):$${version} \
 			$(DOCKER_IMAGE):arm64v8-$${version} --os linux --arch arm64 --variant v8 && \
 		docker manifest push --purge $(DOCKER_IMAGE):$${version} ;\
-- 
cgit v1.2.3