git: a0165254bfeb - main - release: use "runtime" instead of "minimal" for OCI image name
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 27 Apr 2025 23:48:27 UTC
The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=a0165254bfeb5e310f92d4e0c88fcb5c6ea802bf commit a0165254bfeb5e310f92d4e0c88fcb5c6ea802bf Author: Dave Cottlehuber <dch@FreeBSD.org> AuthorDate: 2025-04-27 23:46:47 +0000 Commit: Dave Cottlehuber <dch@FreeBSD.org> CommitDate: 2025-04-27 23:47:29 +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 --- 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