From 687e3239bad5adc9340ca2fc156cd50740558022 Mon Sep 17 00:00:00 2001 From: chez-shanpu Date: Fri, 22 Sep 2023 14:04:44 +0900 Subject: [PATCH] Use cybozu-go/cilium Signed-off-by: chez-shanpu --- cilium-operator-generic/Dockerfile | 7 ++++--- cilium/Dockerfile | 9 ++++----- hubble-relay/Dockerfile | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cilium-operator-generic/Dockerfile b/cilium-operator-generic/Dockerfile index 873994cf3..53fd68e0f 100644 --- a/cilium-operator-generic/Dockerfile +++ b/cilium-operator-generic/Dockerfile @@ -9,10 +9,11 @@ COPY TAG / COPY fix-metallb-bug.patch /tmp/ # LICENSE.all -WORKDIR /go/src/github.com/cilium/cilium +WORKDIR /go/src/github.com/cybozu-go/cilium RUN VERSION=$(cut -d \. -f 1,2,3 < /TAG ) \ - && curl -fsSL "https://github.com/cilium/cilium/archive/v${VERSION}.tar.gz" | \ - tar xzf - --strip-components 1 \ + # Since we use the fork and patched repogitory, we need to specify the branch name + && BRANCH=v{TAG}-lb-dsr-patch \ + && git clone --depth 1 --branch ${BRANCH} https://github.com/cybozu-go/cilium \ && patch -p1 --no-backup-if-mismatch < /tmp/fix-metallb-bug.patch \ && make licenses-all \ && apt-get update \ diff --git a/cilium/Dockerfile b/cilium/Dockerfile index 30f7b2094..ed402eb22 100644 --- a/cilium/Dockerfile +++ b/cilium/Dockerfile @@ -7,14 +7,13 @@ FROM ${GOLANG_IMAGE} as build-base ARG DESTDIR ENV DESTDIR=${DESTDIR} COPY TAG / -COPY cilium.patch /tmp/ -WORKDIR /go/src/github.com/cilium/cilium +WORKDIR /go/src/github.com/cybozu-go/cilium RUN mkdir -p ${DESTDIR} \ && VERSION=$(cut -d \. -f 1,2,3 < /TAG ) \ - && curl -fsSL "https://github.com/cilium/cilium/archive/v${VERSION}.tar.gz" | \ - tar xzf - --strip-components 1 \ - && patch -p1 --no-backup-if-mismatch < /tmp/cilium.patch \ + # Since we use the fork and patched repogitory, we need to specify the branch name + && BRANCH=v{TAG}-lb-dsr-patch \ + && git clone --depth 1 --branch ${BRANCH} https://github.com/cybozu-go/cilium \ && make licenses-all \ && mv LICENSE.all ${DESTDIR}/LICENSE \ && apt-get update \ diff --git a/hubble-relay/Dockerfile b/hubble-relay/Dockerfile index 934ee5319..72d0697c4 100644 --- a/hubble-relay/Dockerfile +++ b/hubble-relay/Dockerfile @@ -8,10 +8,11 @@ FROM ${GOLANG_IMAGE} as build COPY TAG / # LICENSE.all -WORKDIR /go/src/github.com/cilium/cilium +WORKDIR /go/src/github.com/cybozu-go/cilium RUN VERSION=$(cut -d \. -f 1,2,3 < /TAG ) \ - && curl -fsSL "https://github.com/cilium/cilium/archive/v${VERSION}.tar.gz" | \ - tar xzf - --strip-components 1 \ + # Since we use the fork and patched repogitory, we need to specify the branch name + && BRANCH=v{TAG}-lb-dsr-patch \ + && git clone --depth 1 --branch ${BRANCH} https://github.com/cybozu-go/cilium \ && make licenses-all \ && apt-get update \ && apt-get install -y --no-install-recommends binutils-aarch64-linux-gnu \