From f2615f894939a14a6f1a30f23ee1aa16b9cf7f8f Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Sun, 1 Oct 2023 11:41:08 +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 2200e83..90d1b4e 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 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 From 79d306c483d1b83934c33a45b9b2b60cda7e26f1 Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Mon, 2 Oct 2023 11:44:07 +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 90d1b4e..b53a3a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV PATH ${PATH}:/go/bin ENV GO111MODULE=on ENV CGO_ENABLED=0 ENV GOBIN=/bin -ARG BUILDARCH +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.8.0/spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz .