Merge pull request #647 from NikitaSkrynnik/spire

Update Spire version and make Dockerfile support multi-arch build
networkservicemesh · Dec 7, 2023 · 2ca7aaa · 2ca7aaa
2 parents a7dc489 + 3ed5d25
commit 2ca7aaa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,10 +2,11 @@ FROM golang:1.20.11 as go
 ENV GO111MODULE=on
 ENV CGO_ENABLED=0
 ENV GOBIN=/bin
+ARG BUILDARCH=amd64
 RUN go install github.com/go-delve/delve/cmd/[email protected]
 RUN go install github.com/grpc-ecosystem/[email protected]
-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