diff --git a/docs/general/container-building.rst b/docs/general/container-building.rst index 55fc1e1..003dd4b 100644 --- a/docs/general/container-building.rst +++ b/docs/general/container-building.rst @@ -37,8 +37,8 @@ Dependencies ------------ To build ZFSBootMenu images from a build container, either `podman `_ or -`docker `_ is required. The development team prefers ``podman``, but ``docker`` may generally be -substituted without consequence. +`docker `_ 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 `_ and ``podman`` are generally required. A :zbm:`Dockerfile ` is provided for convenience, but feature parity with the ``buildah`` diff --git a/zbm-builder.sh b/zbm-builder.sh index 467e327..adb2637 100755 --- a/zbm-builder.sh +++ b/zbm-builder.sh @@ -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 + Use the specified front-end utility to launch the build container + (Default: podman if available, docker otherwise) -M Provide a comma-separated list of options to use for volume @@ -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 @@ -166,7 +168,7 @@ while getopts "${CMDOPTS}" opt; do b|c|h) ;; d) - PODMAN=docker + PODMAN="${OPTARG}" ;; i) BUILD_IMG="${OPTARG}" @@ -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