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
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
.if defined(WITH_OCIIMAGES) && !empty(WITH_OCIIMAGES)
|
.if defined(WITH_OCIIMAGES) && !empty(WITH_OCIIMAGES)
|
||||||
OCI_IMAGES= static dynamic minimal
|
OCI_IMAGES= static dynamic runtime
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
oci-install:
|
oci-install:
|
||||||
@@ -19,7 +19,7 @@ oci-install:
|
|||||||
OCI_TARGETS=
|
OCI_TARGETS=
|
||||||
OCI_DEPS_static=
|
OCI_DEPS_static=
|
||||||
OCI_DEPS_dynamic= container-image-static.txz
|
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}
|
.for _IMG in ${OCI_IMAGES}
|
||||||
OCI_TARGETS+= container-image-${_IMG}.txz
|
OCI_TARGETS+= container-image-${_IMG}.txz
|
||||||
|
|||||||
@@ -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
|
# installing additional packages while keeping the resulting image as small as
|
||||||
# possible.
|
# possible.
|
||||||
|
|
||||||
# The OS version matching the desired freebsd-minimal image
|
# The OS version matching the desired freebsd-runtime image
|
||||||
ARG version=15.0-CURRENT-amd64
|
ARG version=14.snap
|
||||||
|
|
||||||
# Select freebsd-minimal as our starting point.
|
# Select freebsd-runtime as our starting point.
|
||||||
FROM localhost/freebsd-minimal:${version}
|
FROM localhost/freebsd-runtime:${version}
|
||||||
|
|
||||||
# A list of package(s) to install
|
# A list of package(s) to install
|
||||||
ARG packages
|
ARG packages
|
||||||
|
|
||||||
# Install package management tools. We specify 'FreeBSD' as the repository to
|
# 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
|
# FreeBSD-base pkg repo configs installed and FreeBSD-base does not contain the
|
||||||
# pkg package.
|
# pkg package.
|
||||||
RUN env ASSUME_ALWAYS_YES=yes pkg bootstrap -r FreeBSD && pkg update
|
RUN env ASSUME_ALWAYS_YES=yes pkg bootstrap -r FreeBSD && pkg update
|
||||||
|
|||||||
@@ -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.
|
minimising the package metadata overhead.
|
||||||
|
|
||||||
For instance, To build a new image called 'my-new-image:latest' containing the
|
For instance, To build a new image called 'my-new-image:latest' containing the
|
||||||
|
|||||||
Reference in New Issue
Block a user