From nobody Tue Jul 22 10:47:49 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 4bmYrQ0nKgz62s4V; Tue, 22 Jul 2025 10:47:50 +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 4bmYrP54Z1z3p1Y; Tue, 22 Jul 2025 10:47:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753181269; 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=3Pk538kZMxqYXRYk6dXYBxGSwPjEhaMyTSzbo5WEocg=; b=QlJDo+DaZXYAFnopT7Ua4tz8mtY7JHiNKMtQiG9S74E53hQfndN+lMnKFTK6rgy3sUgKV1 ssIX/MHV9RqfLRBrKFydo8N6ScWkgCfXRFaCUSmvYxpo6VCN9RUQ5+ySVPf6+xVfHbZYrc Imf+QYMxgGV7qND8Z4DKZ5wojbBuWAeefNlsCIu6dimuchLBhUC61kF1AYWDe2fdTrnYbU X9/FzTeb2qVqPKD9Tt8LDFFQijGBJXzOxVB8vUdD4PhRNan+ur0NtxB9yu+O/KzaMCICFv GP1bvbNZEv9BLQHitJvMcds4guazxfJjCDAIRpwNLjiEbpbSW1EFe8Gt8amUvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753181269; 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=3Pk538kZMxqYXRYk6dXYBxGSwPjEhaMyTSzbo5WEocg=; b=YPacVVPG+C2VXWr9ajdr+8/vyGy+DP6OuW6pbJNh5CVcUaAK0isgOk6EIScZiu4jZNKc4P XHRSIyiuSfV7fzJURR2qLEQNbZkNB8U4+LzTeW/yuu4wMBPovbVjkizfBmbv32nxE7Ea4H b9fDH+vdvpMK5U1ePF0Ps1conbJyR8N2YHvVgz5eQpStNYFI+EE6h7M4EbWYkkw1S/zoYj aVzZy6lgyzklSIK1EbltE9cQC2m+P7I3apo/GjhM+jEG5m0ctCDuDXrB8qY1VHQd/5PADH 0UCwW08r79xPd4OLN35MjkneeWw4pEzTeqZJJ8ZY76maBVv28OMdtgdXg0b4sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753181269; a=rsa-sha256; cv=none; b=QJX1WnDy3qhs30qodrQDihRC1B3p2Q9edAouu0Kfs1yL0GyVuTXh86RFb30qGmq2abDXhb NHtaYPdXTu1EUobK9Zo77CsdT+SlFbt809QjQo6k66FoARbo04fRrQPw96saxvIOAGDgtq n9PszUM2MpN85tOvZbPCMTrtqvwQ69HzThC+oSOTzsDJb+tBtQH6tV0+4e06cJu4qnoy41 VaqSoSBbNQOGAv76d58Vft3p1cCLncv3UMRLw9vKP6lQkqVk9ekZNKrvnid5PRScQFcXQX LGpzxs6uwGpNsHWuW/TMpKGoz4eK/t/fNwBBmPGBOlepreppWb3F+ZgS2np7Vg== 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 4bmYrP3sD0z8R8; Tue, 22 Jul 2025 10:47:49 +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 56MAlnst095372; Tue, 22 Jul 2025 10:47:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56MAlnKI095369; Tue, 22 Jul 2025 10:47:49 GMT (envelope-from git) Date: Tue, 22 Jul 2025 10:47:49 GMT Message-Id: <202507221047.56MAlnKI095369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 0fbe9f8ef94d - main - share/examples/oci: Run 'pkg update' with IGNORE_OSVERSION set 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: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fbe9f8ef94d15439e89a3ab951d1dda254d54e3 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=0fbe9f8ef94d15439e89a3ab951d1dda254d54e3 commit 0fbe9f8ef94d15439e89a3ab951d1dda254d54e3 Author: Doug Rabson AuthorDate: 2025-05-28 15:00:00 +0000 Commit: Doug Rabson CommitDate: 2025-07-22 10:46:01 +0000 share/examples/oci: Run 'pkg update' with IGNORE_OSVERSION set This allows the image build to work even if the host's OSVERSION doesn't match the pkgbase OSVERSION which happens if the host's patch level or release version isn't the same as pkgbase. Also fix the image name so that Podman/Buildah will fetch it automatically, removing the need for users to pull an image and retag it before using this example. Reviewed by: dch MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D50596 --- share/examples/oci/Containerfile.pkg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/examples/oci/Containerfile.pkg b/share/examples/oci/Containerfile.pkg index 074c470affc9..f6699c79af71 100644 --- a/share/examples/oci/Containerfile.pkg +++ b/share/examples/oci/Containerfile.pkg @@ -6,7 +6,7 @@ ARG version=14.snap # Select freebsd-runtime as our starting point. -FROM localhost/freebsd-runtime:${version} +FROM ghcr.io/freebsd/freebsd-runtime:${version} # A list of package(s) to install ARG packages @@ -15,7 +15,10 @@ ARG packages # use for downloading pkg since the freebsd-runtime image has both FreeBSD and # FreeBSD-base pkg repo configs installed and FreeBSD-base does not contain the # pkg package. -RUN env ASSUME_ALWAYS_YES=yes pkg bootstrap -r FreeBSD && pkg update +# +# Set IGNORE_OSVERSION to allow building e.g. FreeBSD-14 images on +# FreeBSD-15 hosts. +RUN pkg bootstrap -y -r FreeBSD && pkg -o IGNORE_OSVERSION=yes update -f # Install some package(s). RUN pkg install -y ${packages}