upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

release: use "runtime" instead of "minimal" for OCI image name

Browse source 
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)
This commit is contained in:
Dave Cottlehuber 2025-04-27 23:46:47 +00:00
parent 3f1d9d3343
commit f5418217db
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
release/Makefile.oci
View file

@ -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

0
release/tools/oci-image-minimal.conf → release/tools/oci-image-runtime.conf
View file

12
share/examples/oci/Containerfile.pkg
View file

@ -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

2
share/examples/oci/README
View file

@ -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