From e1ccf444ceb874bc1dc624fc701c4cbbbb562ed0 Mon Sep 17 00:00:00 2001
From: jamesread <contact@jwread.com>
Date: Wed, 17 Nov 2021 18:46:15 +0000
Subject: [PATCH] platform tag on docker images

---
 .goreleaser.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 8b78f4e..8e92ac2 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -80,6 +80,7 @@ dockers:
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Tag}}"
+      - "--platform=linux/amd64"
     extra_files:
       - webui
 
@@ -91,15 +92,17 @@ dockers:
     skip_push: false
     use: docker
     build_flag_templates:
-      - "--platform=linux/amd64"
+      - "--platform=linux/arm64"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Tag}}"
     extra_files:
       - webui
 
+    # This container image actually uses the goarm v5 binary, because v5 helps
+    # support rpi 1's, but it seems most container images start with v7.
   - image_templates:
-      - "docker.io/jamesread/olivetin:{{ .Tag }}-armv5"
+      - "docker.io/jamesread/olivetin:{{ .Tag }}-armv7"
     dockerfile: Dockerfile
     goos: linux
     goarm: 5
@@ -107,7 +110,7 @@ dockers:
     skip_push: false
     use: docker
     build_flag_templates:
-      - "--platform=linux/amd64"
+      - "--platform=linux/arm/v7"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Tag}}"
@@ -119,7 +122,7 @@ docker_manifests:
     image_templates:
       - docker.io/jamesread/olivetin:{{ .Version }}-amd64
       - docker.io/jamesread/olivetin:{{ .Version }}-arm64
-      - docker.io/jamesread/olivetin:{{ .Version }}-armv5
+      - docker.io/jamesread/olivetin:{{ .Version }}-armv7
 
 nfpms:
   - maintainer: James Read <contact@jread.com>