From c4e5c7cc50016d6c430e657d0be6360abeafb136 Mon Sep 17 00:00:00 2001 From: Woodpecker CI Date: Fri, 12 Sep 2025 22:13:38 +0000 Subject: Woodpecker CI e1b7cab09287da4b0b4103793e72252389e23250 [SKIP CI] --- docker/.checksum | 2 +- docker/abuild | 2 +- docker/depends | 2 ++ docker/dockerd.run | 2 +- runc/abuild | 10 +++++++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docker/.checksum b/docker/.checksum index 373929c4..7e285412 100644 --- a/docker/.checksum +++ b/docker/.checksum @@ -1,4 +1,4 @@ 8360105c2dacab5bd5191ef9177f65cc7e238c9caa049e5e116376124d944ad7 cli-v28.4.0.tar.gz 02d796348f328c0386d08096d8cd8c48ae6b10fe7bf7bbdba3709a1940d6b30c dockerd.conf -32d29e80b5704396a2d556a727385038b0186c414d53d72fb5ac0c7e67637311 dockerd.run +197bab16338651c939c613cf27ab029b40670ba6d13a6ed3b2a7882334e2708b dockerd.run 00f9ef7a80ad6767bb97f6a048ffe479800226ad0a28856013b9366fc9783b17 moby-v28.4.0.tar.gz diff --git a/docker/abuild b/docker/abuild index 78ff494b..72f2ebdf 100644 --- a/docker/abuild +++ b/docker/abuild @@ -1,6 +1,6 @@ name=docker version=28.4.0 -release=1 +release=2 source="https://github.com/${name}/cli/archive/v${version}/cli-v${version}.tar.gz https://github.com/moby/moby/archive/v${version}/moby-v28.4.0.tar.gz dockerd.run dockerd.conf" diff --git a/docker/depends b/docker/depends index b5710613..b96746c3 100644 --- a/docker/depends +++ b/docker/depends @@ -1,3 +1,5 @@ containerd runc cgroupfs-mount +iptables +bash diff --git a/docker/dockerd.run b/docker/dockerd.run index 7912dc93..94e88cf6 100644 --- a/docker/dockerd.run +++ b/docker/dockerd.run @@ -3,4 +3,4 @@ exec 2>&1 [ -r conf ] && . ./conf modprobe -q loop || exit 1 cgroupfs-mount -dockerd ${OPTS;--p /var/run/docker.pid -G docker} +dockerd ${OPTS:--p /var/run/docker.pid -G docker} diff --git a/runc/abuild b/runc/abuild index 612a44c6..992494a1 100644 --- a/runc/abuild +++ b/runc/abuild @@ -11,8 +11,12 @@ build() { export CGO_CXXFLAGS="${CXXFLAGS}" export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-trimpath -mod=readonly -modcacherw" - make runc man - install -Dm755 runc "$PKG/usr/bin/runc" + make SHELL=/bin/sh runc + install -Dm755 runc "$PKG/usr/bin/runc" + cd man + sed -i 's/bash/sh/' md2man-all.sh + sed -i '/^cd/d' md2man-all.sh + ./md2man-all.sh install -d "$PKG/usr/share/man/man8" - install -m644 man/man8/*.8 "$PKG/usr/share/man/man8" + install -m644 man8/*.8 "$PKG/usr/share/man/man8" } -- cgit v1.2.3