From nobody Tue Apr 15 22:02:36 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZcdSF4mxBz5sPYB; Tue, 15 Apr 2025 22:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZcdSF1Ms4z3M6g; Tue, 15 Apr 2025 22:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744754557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VS6lg31/rluxNEM0yRPUghApZU3I3m//+teJNktS7Fs=; b=lmYgleoqAX15vT95TZ3tnKLvYg6QmcKDlQlVIC7J4o2A2zvFNjSy3ulilVWMXO54Je76Ux k5NmorwfHwzIatqYBH0ls76rssbCCekQD1LTnmL1+qFHh31F44jIqezk26wO4rkyseObqa QoFu7rYhV02N9d0ISbKYEexLP1R3pFI8jCqUi9LwqRTnWCI92widDHnSamadRZvryf1cL8 xrpiO0ZYilkHz2AvBmIkva7RxIeZG+4OHVpPKFUgbXy99NRqXHc/KuqI70tdTVYcmmBt0a PCtKVkBGtmpSArSFNj7WyeIJ2xqWtf8Di1hkHWlYdr60qFPrQ5XSrSD1219oAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744754557; a=rsa-sha256; cv=none; b=UYyYijuG5Mar/sqSTltWirNL8K4iXMlnWFulosMYtM5g/AwRTzIFpHdBRhIk1NqlbGqc2v OwfwIl+1fxKG3u66hlK59fSBfH3I0lLK5H8RW2T215xfhbQ7K8W6hF3EB7eIYuzbk+bqEJ DPAGQI+z0zlH7G1K/0VochX4QpftpSegLQGZ8FszbHaNubwYDNCcqEzi71GBCOjG4EVR2y qsesml7v6ipUPz4lZAyKmRxyEGnFiWAn0RSoGP8sY/T80QANz82H9YErB1ncfIw8tiQUdF 5aTKycNbx2JTRqxaHpRM6J/Vc9Hdhp4rDsGGYPjfcyh0Igbk32MFUpk3moF65Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744754557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VS6lg31/rluxNEM0yRPUghApZU3I3m//+teJNktS7Fs=; b=U5QfTWI9FD0GbDSijrHGWZfkLlgkO77GCA0jhWh15IQ1WO9H3c7mHcOcfBClv1av/H/OVI ysgo5Z+XFFhQNKPPCQ0bjNyRGLMlxth6bcfSXufrVnhwqWeDaUIkm2HruVWIc3p0AJSxVY A4gSksjTnL+mizCRlsZwpn7XcrDtm0b8Iij1WSWCC7SDXZ5/kXyRRDrTVnPjoaphuaa8in GBR4dzxE9kd/LrQ5Zl9yMhxZTT+t3UkqpXqOuiV/z5Zc1+/ud8WYsYTz0rHw0HhEN8HzZp oCycI6hp94MMBowowL4TReyGBulWK1QT0K5/cRfw8PMII2asB5kMOT4yX0okWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZcdSF05GFzsGF; Tue, 15 Apr 2025 22:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53FM2aW3026531; Tue, 15 Apr 2025 22:02:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FM2a31026528; Tue, 15 Apr 2025 22:02:36 GMT (envelope-from git) Date: Tue, 15 Apr 2025 22:02:36 GMT Message-Id: <202504152202.53FM2a31026528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: 3a79ca65531a - main - release: avoid sparse-file handling for container image layers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a79ca65531adf9fc8799b39407fe4d1b51906f6 Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=3a79ca65531adf9fc8799b39407fe4d1b51906f6 commit 3a79ca65531adf9fc8799b39407fe4d1b51906f6 Author: Doug Rabson AuthorDate: 2025-04-15 22:00:50 +0000 Commit: Dave Cottlehuber CommitDate: 2025-04-15 22:01:45 +0000 release: avoid sparse-file handling for container image layers This improves compatiblity with Podman. See https://github.com/containers/podman/issues/25270 for details. Differential Revision: https://reviews.freebsd.org/D49821 --- release/scripts/make-oci-image.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh index 0fd64602b403..cc599c76bd51 100644 --- a/release/scripts/make-oci-image.sh +++ b/release/scripts/make-oci-image.sh @@ -95,8 +95,13 @@ commit_container() { local image=$1; shift local output=$1; shift - # Note: the diff_id (needed for image config) is the hash of the uncompressed tar - tar -C ${workdir}/rootfs --strip-components 1 -cf ${workdir}/rootfs.tar . + # Note: the diff_id (needed for image config) is the hash of the + # uncompressed tar. + # + # For compatibility with Podman, we must disable sparse-file + # handling. See https://github.com/containers/podman/issues/25270 for + # more details. + tar -C ${workdir}/rootfs --strip-components 1 --no-read-sparse -cf ${workdir}/rootfs.tar . local diff_id=$(sha256 -q < ${workdir}/rootfs.tar) gzip -f ${workdir}/rootfs.tar local create_time=$(date -u +%Y-%m-%dT%TZ)