From 9022e145243834f14fa73a7573e5e75fc20a73da Mon Sep 17 00:00:00 2001
From: Peter Johnson <insomnia@rcpt.at>
Date: Fri, 1 Dec 2023 15:17:43 +0100
Subject: [PATCH] feat(docker): multiarch build

---
 .github/workflows/push.yml | 1 -
 Dockerfile                 | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 6d137ca..cecda0b 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -9,6 +9,5 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKER_BUILD_PLATFORMS: classic
         run: |
           curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -
diff --git a/Dockerfile b/Dockerfile
index 5f62ee4..0adb5d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,12 @@ FROM pelias/libpostal_baseimage as builder
 
 RUN apt-get update && apt-get install -y make pkg-config build-essential
 
-# install go
+# install Golang
 ARG TARGETARCH
-RUN curl "https://dl.google.com/go/go1.11.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
-ENV PATH="$PATH:/usr/local/go/bin"
+RUN wget -qO- "https://golang.org/dl/go1.21.0.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xzf -
+ENV GOROOT="/usr/local/go"
+ENV GOPATH="$HOME/go"
+ENV PATH="${PATH}:$GOROOT/bin:$GOPATH/bin"
 
 # bring in and build project go code
 WORKDIR /code/go-whosonfirst-libpostal