From 072528af83e195c6da74290474440e04bbfc0f39 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Mon, 18 Jan 2021 00:58:47 +0000
Subject: [PATCH] CI: Dockerfile fixes - Pin xcputranslate version - Update
 xcputranslate usage - Set default BUILDPLATFORM to linux/amd64

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4f345a2d..19f4e774 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 ARG ALPINE_VERSION=3.12
 ARG GO_VERSION=1.15
+ARG BUILDPLATFORM=linux/amd64
 
 FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
 RUN apk --update add git
@@ -23,15 +24,15 @@ COPY .golangci.yml ./
 RUN golangci-lint run --timeout=10m
 
 FROM --platform=$BUILDPLATFORM base AS build
-COPY --from=qmcgaw/xcputranslate /xcputranslate /usr/local/bin/xcputranslate
+COPY --from=qmcgaw/xcputranslate:v0.4.0 /xcputranslate /usr/local/bin/xcputranslate
 ARG TARGETPLATFORM
 ARG VERSION=unknown
 ARG BUILD_DATE="an unknown date"
 ARG COMMIT=unknown
 COPY cmd/ ./cmd/
 COPY internal/ ./internal/
-RUN GOARCH="$(echo ${TARGETPLATFORM} | xcputranslate -field arch)" \
-    GOARM="$(echo ${TARGETPLATFORM} | xcputranslate -field arm)" \
+RUN GOARCH="$(xcputranslate -field arch -targetplatform ${TARGETPLATFORM})" \
+    GOARM="$(xcputranslate -field arm -targetplatform ${TARGETPLATFORM})" \
     go build -trimpath -ldflags="-s -w \
     -X 'main.version=$VERSION' \
     -X 'main.buildDate=$BUILD_DATE' \