Merge pull request #5519 from twz123/bump-libseccomp

Bump libseccomp to v2.6.0
k0sproject · Feb 11, 2025 · f4bb543 · f4bb543
2 parents 2c9efde + 4034bf8
commit f4bb543
Showing 1 changed file with 7 additions and 21 deletions.
diff --git a/embedded-bins/runc/Dockerfile b/embedded-bins/runc/Dockerfile
@@ -2,33 +2,19 @@ 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
 
-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
 
-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