From nobody Fri Oct 10 19:52:18 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 4cjy7l0hN8z6BsZ6; Fri, 10 Oct 2025 19:52:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjy7l09Szz44Nh; Fri, 10 Oct 2025 19:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760125939; 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=9lVEDHvWo8Gp1j2AChU/QWTeXay6GB++a2gXAWC8Y/k=; b=J39TUvZ1IPeyFJFhdpPimQYFJwefksBmfeVGef53ttFr9z0Ap4eHeyoOaRRdRBvkTVsYr6 9JOxEUnxcWkk3pzRkZPEFrseh2K2UD4MVA1L4Ta+oU+aiabjimzzyd/xEOedKNBCrLYnGJ XBYrspRhLzsDIxTJopbC0/SI+2hPhAetTaYubTfL1QwypsDeu2gc7raq7oKHhZnA9KDK+d NLBLGR/LKwx/fvWaXpeajOP8y1B8e1DKQvktW8eO/6KfDLnfSv6NAX+RvB784LPUjQk5rQ 7UhxOo2eicwelxkQZxSndz9eCl17y9M9TK8cO/o3Rk4v7ClY5ND+cmOAtQrg7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760125939; 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=9lVEDHvWo8Gp1j2AChU/QWTeXay6GB++a2gXAWC8Y/k=; b=EJ3azwJN72c2TSdgudcYlx3x/LdrhJqOR9a4IHL6jHTDG4kxADPrwru+gzUQg9am69v0OO 9nHDHRScTO70fVNbTu+Kaizh7M2k1xOx80Q4g5X/BNCQgGBu+6n5qlBz5NbA/jtPcPblT6 pfoZmx4ZxxA1AO+pm2EfYU27T8rqG/aid95XQjayX5Gdcd51nrFrvbWFhnP2sOn0mBWld3 8d/q03HjFbWaZtAxcK7TPfr5in169LMx62MAV0j7tHnjrLNhzF92HOEoAA/jrrKKXrhTlh BH1wmw0LDNRaXWax0XRDt8bDKwMzI0e+jjGwiqBdD6UrDFeemHbYS5fDYFlrfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760125939; a=rsa-sha256; cv=none; b=UsZjbASP60ilrM5qEReX99ccjreOVncgjwZosnfh8NmZ+WZhQFhPqRUNcThTvFZiLEPF4E podFLwIDTHKpL8noLpcl9bZNrlaT7ku85bEcfVhyzyNGLt6tDCYjtB+iLqxYJ1tOFP5kDE 4CYlnhTHF6UHyE4+CfCq6pvG7YDEHoaaMCqwtbyqyXkygswYI8bzJt3fGbUm5i5LgplYQW DwPIKx8moIrV4u2lYkTYWoS+bl6q8Fa+8ZfOyWMZAWrIZbnfvDosY0j/mLALCrnP5IQN1x NtiyyOAflpAVBQBbqb/DuGjBiEZJ8kURDvz/kD4jwovOSnLCkqBvaOyzbsBdqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cjy7k6sczz1GKH; Fri, 10 Oct 2025 19:52:18 +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 59AJqIvH009202; Fri, 10 Oct 2025 19:52:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AJqIAT009199; Fri, 10 Oct 2025 19:52:18 GMT (envelope-from git) Date: Fri, 10 Oct 2025 19:52:18 GMT Message-Id: <202510101952.59AJqIAT009199@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: b84e5059dbdd - stable/15 - release: switch OCI containers to use pkg sets 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/15 X-Git-Reftype: branch X-Git-Commit: b84e5059dbdd3f17c4f11e1b6dd21c80c0ff6b8d Auto-Submitted: auto-generated The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=b84e5059dbdd3f17c4f11e1b6dd21c80c0ff6b8d commit b84e5059dbdd3f17c4f11e1b6dd21c80c0ff6b8d Author: Dave Cottlehuber AuthorDate: 2025-10-10 15:55:30 +0000 Commit: Dave Cottlehuber CommitDate: 2025-10-10 19:50:24 +0000 release: switch OCI containers to use pkg sets use minimal-jail in no-toolchain MFC after: 1 hour Reviewed by: ivy Sponsored by: SkunkWerks, GmbH Differential Revision: https://reviews.freebsd.org/D53014 (cherry picked from commit a5b19a0cb9c4321ef45f920a6fc0394449e64779) --- release/tools/oci-image-notoolchain.conf | 54 ++++---------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) diff --git a/release/tools/oci-image-notoolchain.conf b/release/tools/oci-image-notoolchain.conf index a769b53f9ff6..72a62657fa76 100644 --- a/release/tools/oci-image-notoolchain.conf +++ b/release/tools/oci-image-notoolchain.conf @@ -1,67 +1,25 @@ #! /bin/sh -# Build OCI container image with almost all packages suitable for jails, excluding compiler +# Build OCI container image with almost all packages suitable for jails, +# excluding toolchain. OCI_BASE_IMAGE=runtime oci_image_build() { set_cmd ${workdir} /bin/sh install_packages ${abi} ${workdir} \ - FreeBSD-acct \ - FreeBSD-at \ - FreeBSD-audit \ - FreeBSD-autofs \ - FreeBSD-blocklist \ - FreeBSD-bsnmp \ - FreeBSD-caroot \ - FreeBSD-certctl \ - FreeBSD-clibs \ - FreeBSD-console-tools \ - FreeBSD-cron \ - FreeBSD-csh \ + FreeBSD-bmake \ FreeBSD-dma \ - FreeBSD-ee \ - FreeBSD-fd \ - FreeBSD-fetch \ - FreeBSD-ftp \ FreeBSD-inetd \ FreeBSD-ipf \ FreeBSD-ipfw \ - FreeBSD-iscsi \ - FreeBSD-jail \ - FreeBSD-kerberos \ - FreeBSD-kerberos-lib \ - FreeBSD-libarchive \ - FreeBSD-libcompiler_rt-dev \ - FreeBSD-libexecinfo \ - FreeBSD-libucl \ - FreeBSD-locales \ - FreeBSD-lp \ - FreeBSD-mtree \ FreeBSD-natd \ FreeBSD-netmap \ - FreeBSD-newsyslog \ - FreeBSD-nfs \ - FreeBSD-nuageinit \ - FreeBSD-openssl \ - FreeBSD-periodic \ FreeBSD-pf \ - FreeBSD-pkg-bootstrap \ - FreeBSD-quotacheck \ - FreeBSD-rc \ - FreeBSD-rcmds \ - FreeBSD-rescue \ - FreeBSD-resolvconf \ - FreeBSD-runtime \ FreeBSD-ssh \ - FreeBSD-syslogd \ - FreeBSD-tcpd \ FreeBSD-telnet \ - FreeBSD-ufs \ - FreeBSD-unbound \ - FreeBSD-utilities \ - FreeBSD-vi \ - FreeBSD-yp \ + FreeBSD-xz \ FreeBSD-zfs \ - FreeBSD-zoneinfo + FreeBSD-set-minimal-jail } +