From dfcce1c6a6fa5b771823bf90b9266c77b729a864 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 12 Oct 2022 21:51:52 -0400 Subject: [PATCH] fix: ensure we install the golang for the correct architecture TARGETARCH is an automatic build-arg that docker injects - https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope - so this is safe to depend on. --- .devcontainer/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 198efcd58..7e84952ee 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,8 +7,9 @@ RUN apt-get install --no-install-recommends -y build-essential file nano && \ apt-get autoremove --yes && \ rm -rf /var/lib/apt/lists/* -RUN wget https://dl.google.com/go/go1.17.9.linux-amd64.tar.gz && \ - tar -xvf go1.17.9.linux-amd64.tar.gz && \ +ARG TARGETARCH +RUN wget https://dl.google.com/go/go1.17.9.linux-${TARGETARCH}.tar.gz && \ + tar -xvf go1.17.9.linux-${TARGETARCH}.tar.gz && \ mv go /usr/local RUN GOROOT=/usr/local/go /usr/local/go/bin/go install golang.org/x/tools/gopls@latest 2>&1