From 42031f1b0efaae9ff5cf582156dcb67363747f75 Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Sun, 1 Oct 2023 11:41:47 +1100 Subject: [PATCH 1/3] 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 8d0a540..a086dc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,12 @@ 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 . +ADD https://github.com/spiffe/spire/releases/download/v1.8.0/spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz . ADD https://github.com/coredns/coredns/releases/download/v1.9.1/coredns_1.9.1_linux_amd64.tgz . -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 +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 RUN tar xzvf coredns_1.9.1_linux_amd64.tgz -C /bin coredns FROM go as build From 3087e8599fae54f1e6c523c23ac6162c0ffc6445 Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Mon, 2 Oct 2023 11:44:29 +1100 Subject: [PATCH 2/3] 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 a086dc5..a3312ba 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 . From 0f460852d0e50b66a718c0f36b54ad4273a6a28f Mon Sep 17 00:00:00 2001 From: Nikita Skrynnik Date: Fri, 13 Oct 2023 10:33:22 +1100 Subject: [PATCH 3/3] make coredns download multiarch Signed-off-by: Nikita Skrynnik --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3312ba..77ec006 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,9 @@ 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 . -ADD https://github.com/coredns/coredns/releases/download/v1.9.1/coredns_1.9.1_linux_amd64.tgz . +ADD https://github.com/coredns/coredns/releases/download/v1.9.1/coredns_1.9.1_linux_${BUILDARCH}.tgz . 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 -RUN tar xzvf coredns_1.9.1_linux_amd64.tgz -C /bin coredns +RUN tar xzvf coredns_1.9.1_linux_${BUILDARCH}.tgz -C /bin coredns FROM go as build WORKDIR /build