From nobody Tue Apr 15 22:10:33 2025 X-Original-To: dev-commits-src-all@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 4ZcddQ0dRBz5sPmS; Tue, 15 Apr 2025 22:10:34 +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 4ZcddQ0BfSz3Q4V; Tue, 15 Apr 2025 22:10:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744755034; 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=w9z1nj4hhXZZRsvLZ+y61gvANFV1YOzmWggYzMxHHXc=; b=qa8WN1T+gfwqM9sXS6jbeFLj/MB8Tx6GL7X6q4IbRln6eIb74w8ZTOT3c/Gj+Xmh72LpA8 eQrXFMxMShz9hZkhQpSmvhy9PZkTcvei7LS/yA4yIv/PJo9tmMVvvniRpcwkrhkP6hnTGM kLRsbfM0zeSVnSe0VZFEzLsVd7rHCkhaokxXYHblUE7eYbmwjwma8tKE5hyvjHHOiAjaZd fqZaMi8pN6a5UEAh6FUORDctT6TbHXgxV7hhN1vimAKqBu86iMOLOUYFe0PuQvqZHTR5yk VzCw15aKzpRPuNFL28Kcii3yQwDp0SIpvzD51t3/iuOBLPA6PqKRcAWbXDJjOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744755034; a=rsa-sha256; cv=none; b=wrO7o41HAFebLry6c3Ako610Lb7y9epvdIKlVy38Wd1D7rsp8meAta2pTQK+irIn0cdhtl /A7M161wCHcu2WJLT0up7/afA0PZ0PSntQRicm9wJ4S9Wf9JDcGvBPmIMcT3ITJsXA2JGV Ui7QOo5FDkDsFAQtpTp8kUpvcm9ij5NFsFq67g0xYoTLlZIxkwIQz/IN42Q9HyG36gERr/ zDsm0b/jTcdHhQq07D9W5rxw4YbhblUX3SJseNxMh6zML8cJeHbChdkZV1GivKzA+ozubd aasvcdjcNsv6gTQSp6hJmsDL7pDQpBaxm8LuwJwZOIbsoPoN5glRE6lLaCEAwA== 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=1744755034; 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=w9z1nj4hhXZZRsvLZ+y61gvANFV1YOzmWggYzMxHHXc=; b=qEt14Wy+6qcK4sLaK+DvMwMWTGnQ/QL1iMw/62u7vuWDmRDwAjtiF5AY2c/kHGeE229RH6 bK0+TFErdKFPmfnYjDnCxNevXNZowGOnBBny9cmETw0lPYspxf4pY/poIglWUzoPPz+9WT fgzy4FDQAIHOWFeHlydXskYU7+45lyp3fpc366i9NtSpHkT5oKTWIg8xcDVEeMCmALxSpT Ix5z1mS14oU460rF3+ihh4kJ3/f/5YHGTMjyEAffpVn2rpdiqw0gHAcAXSLWyQy1Wgye/i H7hMKw7kEui22OL8tKDU/rHlKVBodHIoA7mf3EbWSCpV3YMW+WuNXihMAL3RPA== 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 4ZcddP6cKxzrfS; Tue, 15 Apr 2025 22:10:33 +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 53FMAXL4037791; Tue, 15 Apr 2025 22:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FMAXfY037788; Tue, 15 Apr 2025 22:10:33 GMT (envelope-from git) Date: Tue, 15 Apr 2025 22:10:33 GMT Message-Id: <202504152210.53FMAXfY037788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: 4317d0aa8c21 - stable/14 - release: avoid sparse-file handling for container image layers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4317d0aa8c21f19764dabcd0bea3d1d92fea19c3 Auto-Submitted: auto-generated The branch stable/14 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=4317d0aa8c21f19764dabcd0bea3d1d92fea19c3 commit 4317d0aa8c21f19764dabcd0bea3d1d92fea19c3 Author: Doug Rabson AuthorDate: 2025-04-15 22:00:50 +0000 Commit: Dave Cottlehuber CommitDate: 2025-04-15 22:09:29 +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 (cherry picked from commit 3a79ca65531adf9fc8799b39407fe4d1b51906f6) --- 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)