Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/general/container-building.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Dependencies
------------

To build ZFSBootMenu images from a build container, either `podman <https://podman.io>`_ or
`docker <https://www.docker.com>`_ is required. The development team prefers ``podman``, but ``docker`` may generally be
substituted without consequence.
`docker <https://www.docker.com>`_ is required. The development team prefers ``podman``, but ``docker`` or a
compatible container utility may generally be substituted without consequence.

If a custom build container is desired, `buildah <https://buildah.io>`_ and ``podman`` are generally required. A
:zbm:`Dockerfile <releng/docker/Dockerfile>` is provided for convenience, but feature parity with the ``buildah``
Expand Down
10 changes: 6 additions & 4 deletions zbm-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ OPTIONS:
Specify the path to a configuration file that will be sourced
(Default: \${BUILD_DIRECTORY}/zbm-builder.conf, if it exists)

-d Force use of docker instead of podman
-d <container-frontend>
Use the specified front-end utility to launch the build container
(Default: podman if available, docker otherwise)

-M <argument>
Provide a comma-separated list of options to use for volume
Expand Down Expand Up @@ -119,7 +121,7 @@ else
PODMAN="docker"
fi

CMDOPTS="b:dhi:l:L:c:M:O:HR"
CMDOPTS="b:d:hi:l:L:c:M:O:HR"

# First pass to get build directory and configuration file
while getopts "${CMDOPTS}" opt; do
Expand Down Expand Up @@ -166,7 +168,7 @@ while getopts "${CMDOPTS}" opt; do
b|c|h)
;;
d)
PODMAN=docker
PODMAN="${OPTARG}"
;;
i)
BUILD_IMG="${OPTARG}"
Expand Down Expand Up @@ -202,7 +204,7 @@ done
shift $((OPTIND-1))

if ! command -v "${PODMAN}" >/dev/null 2>&1; then
echo "ERROR: this script requires podman or docker"
echo "ERROR: ${PODMAN} not found; use '-d' to specify a container front-end"
exit 1
fi

Expand Down