From nobody Wed Sep 17 21:17:25 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 4cRs6Z1Vnnz6851X; Wed, 17 Sep 2025 21:17:26 +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 4cRs6Z0pg2z3MsF; Wed, 17 Sep 2025 21:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758143846; 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=DiFHSSBspET7u/Ut+346bRI9iKorAS5nU/1lFFFPqDM=; b=f7EkhORbL83eIuPrKZo/xGtbodiWHywO0PpZvANA+M7kktCbkIF6H33u1SxrPODi5l8AcA szMbq+CdnpyysnRJJVgMxFX7j91M2mvWc2NaY/W9xOhx0TsRSNIloxtvRzdhuhFANtIWA1 sTYOfCkEkjYrIV8DdkYBrrDbfYPr22sDWpwnakhs6LEsjMtAx5ucUns71orCNS6lwUCpMa ovRsGZ57UAOYKoXtFj7MNPrhtyGtDR8f1oO2hpIk9LLdUrRa2x7qSlt+zGJvVR/mDPQtcy CZMK7vAOaa3GyR1hhjbvyoKMOw7h4wRzVwqZqrQ2nKR/X4NTgd8AHRmhy8Zo3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758143846; 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=DiFHSSBspET7u/Ut+346bRI9iKorAS5nU/1lFFFPqDM=; b=rWM1IF2xn66ZqXi/FofF2Z+QfOMoTyX1OxxRuIF1luTDkYRznxYJkqVpt18ohr7LMujEMb +L7krG1lVoUfUhg6fbNNlcIjM4rxwtvZWpDwWuX2EvEDxJCdgbG6Nr8sNR169pqBArxn+C thMeq2vw6FHaPK0sEEAd/nZWWMOsAzSknlTb64PgaYHBLwsi/57E+RMjovAjK9wgaqjJ/F NYIWYfNvG+8yH7K4BLxt0MCn1lYaaz1AQaYeQOr6NEYzOHhfudp0azr8VPrInBoijlGFue 7sC4Vbv0hh06iDIfDi7ZxPZMWogaZTTgva1buPROfdirPOS9yt5d+wDcFkoy7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758143846; a=rsa-sha256; cv=none; b=J+VPyv/p06e2CcrtNrtZms1yo40xb17DwJX7p0CpGqTYqSneEdPm/nVJCiEzxn1kA0CMPA 40XYuuh2DxkDXaWk9GZZxLaVBGD0B0ELbYnMSOLbF49QMRiLTDAwEmszdg5XRtQWa6Hi1Z 3aKYMDuHwJTiEqBl6dec9nf+P48cegkbR0yCTVKQg17eXonnqAo4mMLivoEZZxoZAVYPUF devTXUkiq+ti+u+tXXRVDFjDInb9vsoZchR9eSbbDWYPH/bve33XZBmGoXacCOENP35Um7 CfNfdCabaAX0wLDT7bD8rgaJ3QkplKEA67pPjXShgOODA76WdF9yR9MaVQVegA== 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 4cRs6Z04DPzk7L; Wed, 17 Sep 2025 21:17:26 +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 58HLHPrK005347; Wed, 17 Sep 2025 21:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HLHPHP005344; Wed, 17 Sep 2025 21:17:25 GMT (envelope-from git) Date: Wed, 17 Sep 2025 21:17:25 GMT Message-Id: <202509172117.58HLHPHP005344@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: 728ec0c094ce - main - release: Add images for almost all packages, with & without toolchain 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: 728ec0c094ce473ae17ebd1adb05f0959bf3a68e Auto-Submitted: auto-generated The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=728ec0c094ce473ae17ebd1adb05f0959bf3a68e commit 728ec0c094ce473ae17ebd1adb05f0959bf3a68e Author: Dave Cottlehuber AuthorDate: 2025-09-17 21:16:37 +0000 Commit: Dave Cottlehuber CommitDate: 2025-09-17 21:16:37 +0000 release: Add images for almost all packages, with & without toolchain Contains almost everything of use in a container except: - *lib32 - *dev - *dbg - *src - anything expecting hardware such as device config tools Differential Revision: https://reviews.freebsd.org/D51471 Reviewed by: dfr, emaste Approved by: cperciva MFC after: 1 day Sponsored by: SkunkWerks, GmbH --- release/Makefile.oci | 8 ++-- release/scripts/make-oci-image.sh | 2 +- release/tools/oci-image-notoolchain.conf | 68 ++++++++++++++++++++++++++++++++ release/tools/oci-image-toolchain.conf | 16 ++++++++ 4 files changed, 90 insertions(+), 4 deletions(-) diff --git a/release/Makefile.oci b/release/Makefile.oci index a6f998002f92..16c475937d15 100644 --- a/release/Makefile.oci +++ b/release/Makefile.oci @@ -3,7 +3,7 @@ # .if defined(WITH_OCIIMAGES) && !empty(WITH_OCIIMAGES) -OCI_IMAGES= static dynamic runtime +OCI_IMAGES= static dynamic runtime notoolchain toolchain .endif oci-install: @@ -16,8 +16,10 @@ oci-install: OCI_TARGETS= OCI_DEPS_static= -OCI_DEPS_dynamic= container-image-static.txz -OCI_DEPS_runtime= container-image-dynamic.txz +OCI_DEPS_dynamic=container-image-static.txz +OCI_DEPS_runtime=container-image-dynamic.txz +OCI_DEPS_notoolchain=container-image-runtime.txz +OCI_DEPS_toolchain=container-image-notoolchain.txz .for _IMG in ${OCI_IMAGES} OCI_TARGETS+= container-image-${_IMG}.txz diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh index 8a620e9d8973..6e5ad69741f7 100644 --- a/release/scripts/make-oci-image.sh +++ b/release/scripts/make-oci-image.sh @@ -47,7 +47,7 @@ install_packages() { # metadata for what was installed). This trims more than 40Mb from the # resulting image. env IGNORE_OSVERSION=yes ABI=${abi} pkg --rootdir ${rootdir} --repo-conf-dir ${workdir}/repos \ - install -yq "$@" || exit $? + install -yq -g "$@" || exit $? rm -rf ${rootdir}/var/db/pkg/repos } diff --git a/release/tools/oci-image-notoolchain.conf b/release/tools/oci-image-notoolchain.conf new file mode 100644 index 000000000000..e251281a7357 --- /dev/null +++ b/release/tools/oci-image-notoolchain.conf @@ -0,0 +1,68 @@ +#! /bin/sh + +# Build OCI container image with almost all packages suitable for jails, excluding compiler + +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-dma \ + FreeBSD-ee \ + FreeBSD-fd \ + FreeBSD-fetch \ + FreeBSD-ftp \ + FreeBSD-ftpd \ + 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-zfs \ + FreeBSD-zoneinfo +} diff --git a/release/tools/oci-image-toolchain.conf b/release/tools/oci-image-toolchain.conf new file mode 100644 index 000000000000..b3b7eed8e8d1 --- /dev/null +++ b/release/tools/oci-image-toolchain.conf @@ -0,0 +1,16 @@ +#! /bin/sh + +# Build Open Container Initiative (OCI) container image with almost all of FreeBSD base.txz + +OCI_BASE_IMAGE=notoolchain + +oci_image_build() { + set_cmd ${workdir} /bin/sh + install_packages ${abi} ${workdir} \ + FreeBSD-clang \ + FreeBSD-ctf-tools \ + FreeBSD-lld \ + FreeBSD-lldb \ + FreeBSD-toolchain \ + FreeBSD-*-dev +}