From 5efa34ced76ec6ab1d88523796d84767f849458c Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik <93182827+NikitaSkrynnik@users.noreply.github.com> Date: Thu, 7 Dec 2023 22:37:57 +0700 Subject: [PATCH] Update Spire version and make Dockerfile support multi-arch build (#604) * Update Spire version and make Dockerfile support multi-arch build Signed-off-by: Nikita Skrynnik * Use a default value for BUILDARCH agrument Signed-off-by: Nikita Skrynnik --------- Signed-off-by: Nikita Skrynnik --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65e677d..50a42bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,11 @@ ENV PATH ${PATH}:/go/bin ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOBIN=/bin +ARG BUILDARCH=amd64 RUN rm -r /etc/vpp RUN go install github.com/go-delve/delve/cmd/dlv@v1.21.0 -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