From 10ac1d13b94b280d37064cd73a37617cc9b81bf5 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Sat, 16 Jul 2022 12:20:50 +0100
Subject: [PATCH] Build for multiplatform

---
 .github/workflows/build-docker-image.yaml | 1 +
 .github/workflows/release.yaml            | 2 +-
 Dockerfile                                | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml
index 1e03282..2dd7bbb 100644
--- a/.github/workflows/build-docker-image.yaml
+++ b/.github/workflows/build-docker-image.yaml
@@ -27,6 +27,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: |
             ghcr.io/${{ github.repository_owner }}/aaisp-exporter:${{ github.ref_name }}
             ghcr.io/${{ github.repository_owner }}/aaisp-exporter:latest
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 20c674c..c086c5e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -22,7 +22,7 @@ jobs:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         goos: ${{ matrix.goos }}
         goarch: ${{ matrix.goarch }}
-        goversion: "https://dl.google.com/go/go1.18.1.linux-amd64.tar.gz"
+        goversion: "https://dl.google.com/go/go1.18.4.linux-amd64.tar.gz"
         project_path: "./cmd/aaisp_exporter"
         binary_name: "aaisp_exporter"
         extra_files: LICENSE cmd/aaisp_exporter/README.md
diff --git a/Dockerfile b/Dockerfile
index 2ed96ff..d2162e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18.4-alpine3.15 as build
+FROM golang:1.18.4-alpine3.16 as build
 WORKDIR /build
 COPY . .
 RUN go get -d -v .
@@ -7,4 +7,4 @@ RUN go build -v ./cmd/aaisp_exporter
 FROM alpine:3.16.0
 WORKDIR /service
 COPY --from=build /build/aaisp_exporter .
-ENTRYPOINT ["./aaisp_exporter"]%
\ No newline at end of file
+ENTRYPOINT ["./aaisp_exporter"]
\ No newline at end of file