From a956dbcfea554598d7292f1554a5c866813c353d Mon Sep 17 00:00:00 2001 From: Michi Mutsuzaki Date: Thu, 19 Sep 2024 21:13:41 +0000 Subject: [PATCH] release: Install curl Install curl in the release make target so that CILIUM_VERSION gets set properly. Fixes: #2795 Fixes: #2802 Signed-off-by: Michi Mutsuzaki --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d934460ef8..4ceaf35ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM docker.io/library/golang:1.23.1-alpine3.19@sha256:e0ea2a119ae0939a6d449ea18b2b1ba30b44986ec48dbb88f3a93371b4bf8750 AS builder WORKDIR /go/src/github.com/cilium/cilium-cli -RUN apk add --no-cache git make ca-certificates +RUN apk add --no-cache curl git make ca-certificates COPY . . RUN make diff --git a/Makefile b/Makefile index 12cf4c4f66..47a59a9beb 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ release: --rm \ --workdir /cilium \ --volume `pwd`:/cilium docker.io/library/golang:$(GO_IMAGE_VERSION)@$(GO_IMAGE_SHA) \ - sh -c "apk add --no-cache setpriv make git zip && \ + sh -c "apk add --no-cache curl setpriv make git zip && \ /usr/bin/setpriv --reuid=$(RELEASE_UID) --regid=$(RELEASE_GID) --clear-groups make GOCACHE=/tmp/gocache local-release" local-release: clean