From c45ae5c918e51552778011c717a111b5160bd2e0 Mon Sep 17 00:00:00 2001 From: Rodrigo Campos Date: Wed, 2 Apr 2025 16:33:26 +0200 Subject: [PATCH 1/3] WIP: Test upcoming runc 1.3 Signed-off-by: Rodrigo Campos --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4a31d8eef41..a77eeb7d7a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # Basic deps # @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/- ARG CONTAINERD_VERSION=v2.0.4@1a43cb6a1035441f9aca8f5666a9b3ef9e70ab20 -ARG RUNC_VERSION=v1.2.6@e89a29929c775025419ab0d218a43588b4c12b9a +ARG RUNC_VERSION=2ea0a21e58a2eca47b7f37ffda0db5b9e804cc6a@2ea0a21e58a2eca47b7f37ffda0db5b9e804cc6a ARG CNI_PLUGINS_VERSION=v1.6.2@BINARY # Extra deps: Build @@ -86,7 +86,9 @@ RUN GO=xx-go make STATIC=1 && \ FROM build-base-debian AS build-runc ARG RUNC_VERSION ARG TARGETARCH -RUN git clone --quiet --depth 1 --branch "${RUNC_VERSION%@*}" https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc +#RUN git clone --quiet --depth 1 --branch "${RUNC_VERSION%@*}" https://github.com/rata/runc.git /go/src/github.com/opencontainers/runc +RUN git clone --quiet https://github.com/rata/runc.git /go/src/github.com/opencontainers/runc +RUN cd /go/src/github.com/opencontainers/runc; git reset --hard "${RUNC_VERSION%@*}" WORKDIR /go/src/github.com/opencontainers/runc RUN git-checkout-tag-with-hash.sh ${RUNC_VERSION} && \ mkdir -p /out From f7eb8b99e8c8acbb2e178d55049920d0b4eb6c7f Mon Sep 17 00:00:00 2001 From: Rodrigo Campos Date: Fri, 11 Apr 2025 11:33:54 +0200 Subject: [PATCH 2/3] Revert "WIP: Test upcoming runc 1.3" This reverts commit c45ae5c918e51552778011c717a111b5160bd2e0. Signed-off-by: Rodrigo Campos --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a77eeb7d7a6..4a31d8eef41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # Basic deps # @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/- ARG CONTAINERD_VERSION=v2.0.4@1a43cb6a1035441f9aca8f5666a9b3ef9e70ab20 -ARG RUNC_VERSION=2ea0a21e58a2eca47b7f37ffda0db5b9e804cc6a@2ea0a21e58a2eca47b7f37ffda0db5b9e804cc6a +ARG RUNC_VERSION=v1.2.6@e89a29929c775025419ab0d218a43588b4c12b9a ARG CNI_PLUGINS_VERSION=v1.6.2@BINARY # Extra deps: Build @@ -86,9 +86,7 @@ RUN GO=xx-go make STATIC=1 && \ FROM build-base-debian AS build-runc ARG RUNC_VERSION ARG TARGETARCH -#RUN git clone --quiet --depth 1 --branch "${RUNC_VERSION%@*}" https://github.com/rata/runc.git /go/src/github.com/opencontainers/runc -RUN git clone --quiet https://github.com/rata/runc.git /go/src/github.com/opencontainers/runc -RUN cd /go/src/github.com/opencontainers/runc; git reset --hard "${RUNC_VERSION%@*}" +RUN git clone --quiet --depth 1 --branch "${RUNC_VERSION%@*}" https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc WORKDIR /go/src/github.com/opencontainers/runc RUN git-checkout-tag-with-hash.sh ${RUNC_VERSION} && \ mkdir -p /out From 03380605f724b9fd86465be0506d1257ee94188f Mon Sep 17 00:00:00 2001 From: Rodrigo Campos Date: Fri, 11 Apr 2025 11:35:52 +0200 Subject: [PATCH 3/3] WIP: Test runc 1.3.0-rc.2 Signed-off-by: Rodrigo Campos --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4a31d8eef41..9cda0f17da7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # Basic deps # @BINARY: the binary checksums are verified via Dockerfile.d/SHA256SUMS.d/- ARG CONTAINERD_VERSION=v2.0.4@1a43cb6a1035441f9aca8f5666a9b3ef9e70ab20 -ARG RUNC_VERSION=v1.2.6@e89a29929c775025419ab0d218a43588b4c12b9a +ARG RUNC_VERSION=v1.3.0-rc.2@159c67f8e2233b6cb84a203dc47ed182381b666c ARG CNI_PLUGINS_VERSION=v1.6.2@BINARY # Extra deps: Build