From c89be2873a5e36d9c479f26523c72581aa78ad9f Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Wed, 5 Feb 2025 14:02:44 +0100 Subject: [PATCH 1/2] Revert "Run libseccomp tests in parallel" This reverts commit 165d4da8d1513ca3909cde2ed642d9c80fb425e4. Signed-off-by: Tom Wieczorek --- embedded-bins/runc/Dockerfile | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/embedded-bins/runc/Dockerfile b/embedded-bins/runc/Dockerfile index 146c42a76020..7e9fb099dd32 100644 --- a/embedded-bins/runc/Dockerfile +++ b/embedded-bins/runc/Dockerfile @@ -2,7 +2,7 @@ ARG BUILDIMAGE FROM $BUILDIMAGE AS build RUN apk add build-base git \ - curl linux-headers gperf bash pkgconf cmd:tail + curl linux-headers gperf bash pkgconf ENV GOPATH=/go @@ -10,25 +10,11 @@ ARG LIBSECCOMP_VERSION=2.5.5 RUN curl --proto '=https' --tlsv1.2 -L https://github.com/seccomp/libseccomp/releases/download/v$LIBSECCOMP_VERSION/libseccomp-$LIBSECCOMP_VERSION.tar.gz \ | tar -C / -zx -WORKDIR /libseccomp-$LIBSECCOMP_VERSION -# tests: add basic support for running tests in parallel -RUN curl -L https://github.com/seccomp/libseccomp/commit/2380f5788c692796f75e464c61aa877e5c4eb882.patch \ - | git apply -# tests: limit the number of bpf-sim-fuzz test iterations -# https://github.com/seccomp/libseccomp/commit/5878cf2383ccedca3536f47155b13145809ae08e -# the patch didnt apply due to commit touches .travis/ -# Use sed instead -RUN sed -i -e 's/50$/5/' tests/*-sim-*.tests - -# tests: add support for the LIBSECCOMP_TSTCFG_JOBS env variable -RUN curl -L https://github.com/seccomp/libseccomp/commit/4c19425fa69cfb4f7de5225d676a26ef0b442e28.patch \ - | git apply -RUN ./configure --sysconfdir=/etc --enable-static - -RUN make -j$(nproc) -RUN make -j$(nproc) check-build -RUN make -C tests check LIBSECCOMP_TSTCFG_JOBS=$(nproc) -RUN make install +RUN cd /libseccomp-$LIBSECCOMP_VERSION && ./configure --sysconfdir=/etc --enable-static + +RUN make -j$(nproc) -C /libseccomp-$LIBSECCOMP_VERSION +RUN make -j$(nproc) -C /libseccomp-$LIBSECCOMP_VERSION check +RUN make -C /libseccomp-$LIBSECCOMP_VERSION install ARG VERSION RUN mkdir -p $GOPATH/src/github.com/opencontainers/runc From 4034bf84744fe48d398bc3788aef0e25703c24ae Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Wed, 5 Feb 2025 14:02:55 +0100 Subject: [PATCH 2/2] Bump libseccomp to v2.6.0 https://github.com/seccomp/libseccomp/releases/tag/v2.6.0 Signed-off-by: Tom Wieczorek --- embedded-bins/runc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embedded-bins/runc/Dockerfile b/embedded-bins/runc/Dockerfile index 7e9fb099dd32..35648bd78197 100644 --- a/embedded-bins/runc/Dockerfile +++ b/embedded-bins/runc/Dockerfile @@ -6,7 +6,7 @@ RUN apk add build-base git \ ENV GOPATH=/go -ARG LIBSECCOMP_VERSION=2.5.5 +ARG LIBSECCOMP_VERSION=2.6.0 RUN curl --proto '=https' --tlsv1.2 -L https://github.com/seccomp/libseccomp/releases/download/v$LIBSECCOMP_VERSION/libseccomp-$LIBSECCOMP_VERSION.tar.gz \ | tar -C / -zx