From 0222409f96b0e6e3447da2c5d799e51ef07daaf7 Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Sun, 1 Oct 2023 11:40:11 +1100 Subject: [PATCH 1/2] Update Spire version and make Dockerfile support multi-arch build Signed-off-by: Nikita Skrynnik --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffb6a33..67feac2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,10 @@ FROM golang:1.20.11 as go ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOBIN=/bin +ARG BUILDARCH RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 -ADD https://github.com/spiffe/spire/releases/download/v1.2.2/spire-1.2.2-linux-x86_64-glibc.tar.gz . -RUN tar xzvf spire-1.2.2-linux-x86_64-glibc.tar.gz -C /bin --strip=2 spire-1.2.2/bin/spire-server spire-1.2.2/bin/spire-agent +ADD https://github.com/spiffe/spire/releases/download/v1.8.0/spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz . +RUN tar xzvf spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz -C /bin --strip=2 spire-1.8.0/bin/spire-server spire-1.8.0/bin/spire-agent FROM go as build WORKDIR /build From c5a3236372c5c4bb11f5dd70a06a65ba11420ca7 Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Mon, 2 Oct 2023 11:43:34 +1100 Subject: [PATCH 2/2] Use a default value for BUILDARCH agrument Signed-off-by: Nikita Skrynnik --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 67feac2..c08bbf2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM golang:1.20.11 as go ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOBIN=/bin -ARG BUILDARCH +ARG BUILDARCH=amd64 RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2 ADD https://github.com/spiffe/spire/releases/download/v1.8.0/spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz . RUN tar xzvf spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz -C /bin --strip=2 spire-1.8.0/bin/spire-server spire-1.8.0/bin/spire-agent