From nobody Wed Apr 30 07:58:34 2025 X-Original-To: dev-commits-src-branches@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 4ZnV1Q5BnPz5v3gN; Wed, 30 Apr 2025 07:58: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnV1Q3mm8z3Kjp; Wed, 30 Apr 2025 07:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745999914; 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=Y9LSJwIjjvTOdAuUOrjQ8qEP5hbrQt67UsZfSe82r68=; b=gIhBqkaD+96XfgPOL/eZ57TqLLoLwuru5HrIyUdIR9X8c1Ur7zWNBrZDXg9Ize0GVe2mhG wsmYmX7BKD+B113GUcyAeoAV2u6xhX5HJc/gSyEqJjXIBEZ10cdy3jpZ/jkxULu16Ub3qI 3CRRmEVq2gKkVAuLcZHrnmSB0Rmf2VSUnA6vlrYFRRGTcez8/JMb66/LCmNGc/mjkcMSp4 ydDm4kTUp8D4uIYQ81ptdxWs7Yf5eo3apTP4TSiJaXkpu9EZOljlOy/P9/XuEvnn4eR1J4 0bE2lTb9FSVDQg7UdEHG9kxa3yLWCnlJsbtsbenlIq25PR6KivbdIoAY7UJJug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745999914; a=rsa-sha256; cv=none; b=Tj7F1CNnqy6QZutsoUj3CcMLaYwrUR1sBCDYKwLDcJJA7JoAJno2I4BGv++ArBG7Yc+aXp Q9LLmLgm+eKB1cT1uyxblzcBg58L7FTWJ2HujHP5QKswHr+WkDPa/iXy76/UuODjWv0yUd rHQlIH/zbynWUsViUOiVcdg4e6MCmocPrpyqoSreH1LpsNl0qn+r5w6C5smMfp2x429lNc l3hZYKMSruvKqYw3uONddtpCntVn+2OeXa4q12vzPIknUFYII5/rPWl8Bfc0czzgeyAVMf suJxRTDBwDllLOtWXMlB/ny/3L+JpToRSVU1CqfWxp/BAPE/Ul52ozs+ItmNng== 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=1745999914; 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=Y9LSJwIjjvTOdAuUOrjQ8qEP5hbrQt67UsZfSe82r68=; b=ZslN4BrlDHkSyTWKufqCDx8Bm7TGFDYa1IZmnO8fZ7APUnrBHTwnNFxWhpmUK13Pp6ULhA pFAwYUFU/MLw80Rw+CV9a3Ixmd5OrTJ32NjUIHJbndq06l4NsBZMPieaSCReeCDp/HIzql hxvazJTD07nvlqDlrOd+R2Mebk4o32Uxbx6lDcLWWQnpndnT3VWMTujjMY19M0OtIPQi4e tmx1YlSbfzJoLTU+qNObMHszaWuO3icoxWG+rlNchWvMerxkF3UXFN/uuPYAiXOZ7ialEc RT8CMFhIU0TWaXQbzpPORQkn0Jms/rmaM49Z02fp9IDrbu4w5tPge18YnHcd3A== 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 4ZnV1Q303CzxgT; Wed, 30 Apr 2025 07:58:34 +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 53U7wYeT029944; Wed, 30 Apr 2025 07:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53U7wY6k029941; Wed, 30 Apr 2025 07:58:34 GMT (envelope-from git) Date: Wed, 30 Apr 2025 07:58:34 GMT Message-Id: <202504300758.53U7wY6k029941@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: f5418217dbc6 - stable/14 - release: use "runtime" instead of "minimal" for OCI image name List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: f5418217dbc6c3f9317479183b06fff6be147ab3 Auto-Submitted: auto-generated The branch stable/14 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=f5418217dbc6c3f9317479183b06fff6be147ab3 commit f5418217dbc6c3f9317479183b06fff6be147ab3 Author: Dave Cottlehuber AuthorDate: 2025-04-27 23:46:47 +0000 Commit: Dave Cottlehuber CommitDate: 2025-04-30 07:55:41 +0000 release: use "runtime" instead of "minimal" for OCI image name The runtime name is taken from the main pkg-base package that this image is built off. Sponsored by: SkunkWerks, GmbH MFC after: 3 days Reviewed by: dfr, emaste Differential Revision: https://reviews.freebsd.org/D50043 (cherry picked from commit a0165254bfeb5e310f92d4e0c88fcb5c6ea802bf) --- release/Makefile.oci | 4 ++-- .../tools/{oci-image-minimal.conf => oci-image-runtime.conf} | 0 share/examples/oci/Containerfile.pkg | 12 ++++++------ share/examples/oci/README | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release/Makefile.oci b/release/Makefile.oci index e4b5df580055..2290f2acbcff 100644 --- a/release/Makefile.oci +++ b/release/Makefile.oci @@ -5,7 +5,7 @@ # .if defined(WITH_OCIIMAGES) && !empty(WITH_OCIIMAGES) -OCI_IMAGES= static dynamic minimal +OCI_IMAGES= static dynamic runtime .endif oci-install: @@ -19,7 +19,7 @@ oci-install: OCI_TARGETS= OCI_DEPS_static= OCI_DEPS_dynamic= container-image-static.txz -OCI_DEPS_minimal= container-image-dynamic.txz +OCI_DEPS_runtime= container-image-dynamic.txz .for _IMG in ${OCI_IMAGES} OCI_TARGETS+= container-image-${_IMG}.txz diff --git a/release/tools/oci-image-minimal.conf b/release/tools/oci-image-runtime.conf similarity index 100% rename from release/tools/oci-image-minimal.conf rename to release/tools/oci-image-runtime.conf diff --git a/share/examples/oci/Containerfile.pkg b/share/examples/oci/Containerfile.pkg index ed8ac7caf4b6..074c470affc9 100644 --- a/share/examples/oci/Containerfile.pkg +++ b/share/examples/oci/Containerfile.pkg @@ -1,18 +1,18 @@ -# This is an example showing how to extend the freebsd-minimal OCI image by +# This is an example showing how to extend the freebsd-runtime OCI image by # installing additional packages while keeping the resulting image as small as # possible. -# The OS version matching the desired freebsd-minimal image -ARG version=15.0-CURRENT-amd64 +# The OS version matching the desired freebsd-runtime image +ARG version=14.snap -# Select freebsd-minimal as our starting point. -FROM localhost/freebsd-minimal:${version} +# Select freebsd-runtime as our starting point. +FROM localhost/freebsd-runtime:${version} # A list of package(s) to install ARG packages # Install package management tools. We specify 'FreeBSD' as the repository to -# use for downloading pkg since the freebsd-minimal image has both FreeBSD and +# 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 diff --git a/share/examples/oci/README b/share/examples/oci/README index 212687251754..890641cee300 100644 --- a/share/examples/oci/README +++ b/share/examples/oci/README @@ -1,4 +1,4 @@ -This example Containerfile shows how to add packages to freebsd-minimal while +This example Containerfile shows how to add packages to freebsd-runtime while minimising the package metadata overhead. For instance, To build a new image called 'my-new-image:latest' containing the