[PATCH 1/5] tools/build-docs-container: move container files in their own directory

Antonin Godard
2025-12-05T14:51:42Z

Create a directory to hold the Containerfiles as they were lying next to
the scripts. Change the build context of the docker build command to
build from SCRIPT_DIR and pass the host packages scripts and container
file relative to it.

Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
documentation/tools/build-docs-container | 13 ++++++-------
.../tools/{ => containerfiles}/Containerfile.almalinux | 0
documentation/tools/{ => containerfiles}/Containerfile.apt | 0
.../tools/{ => containerfiles}/Containerfile.debian | 0
documentation/tools/{ => containerfiles}/Containerfile.dnf | 0
.../tools/{ => containerfiles}/Containerfile.fedora | 0
.../tools/{ => containerfiles}/Containerfile.ubuntu | 0
.../tools/{ => containerfiles}/Containerfile.zypper | 0
8 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/documentation/tools/build-docs-container b/documentation/tools/build-docs-container
index b91a6daa9..7d25b15b9 100755
--- a/documentation/tools/build-docs-container
+++ b/documentation/tools/build-docs-container
@@ -23,7 +23,6 @@ set -eu -o pipefail
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
CONTAINERCMD=${CONTAINERCMD:-docker}
DOCS_DIR="$SCRIPT_DIR/../.."
-SH_DIR="$SCRIPT_DIR/host_packages_scripts"
INCLUDE_ESSENTIAL_PACKAGES=${INCLUDE_ESSENTIAL_PACKAGES:-0}

function usage()
@@ -140,12 +139,12 @@ main ()
--tag "yocto-docs-$sanitized_dockername:latest" \
--build-arg ARG_FROM="docker.io/$image" \
--build-arg INCLUDE_ESSENTIAL_PACKAGES="${INCLUDE_ESSENTIAL_PACKAGES}" \
- --build-arg ESSENTIAL="$essential" \
- --build-arg DOCS="$docs" \
- --build-arg DOCS_PDF="$docs_pdf" \
- --build-arg PIP3="${pip3:-}" \
- --file "$SCRIPT_DIR/$containerfile" \
- "$SH_DIR/"
+ --build-arg ESSENTIAL="host_packages_scripts/$essential" \
+ --build-arg DOCS="host_packages_scripts/$docs" \
+ --build-arg DOCS_PDF="host_packages_scripts/$docs_pdf" \
+ --build-arg PIP3="host_packages_scripts/${pip3:-}" \
+ --file "$SCRIPT_DIR/containerfiles/$containerfile" \
+ "$SCRIPT_DIR"

local -a args_run=(
--rm
diff --git a/documentation/tools/Containerfile.almalinux b/documentation/tools/containerfiles/Containerfile.almalinux
similarity index 100%
rename from documentation/tools/Containerfile.almalinux
rename to documentation/tools/containerfiles/Containerfile.almalinux
diff --git a/documentation/tools/Containerfile.apt b/documentation/tools/containerfiles/Containerfile.apt
similarity index 100%
rename from documentation/tools/Containerfile.apt
rename to documentation/tools/containerfiles/Containerfile.apt
diff --git a/documentation/tools/Containerfile.debian b/documentation/tools/containerfiles/Containerfile.debian
similarity index 100%
rename from documentation/tools/Containerfile.debian
rename to documentation/tools/containerfiles/Containerfile.debian
diff --git a/documentation/tools/Containerfile.dnf b/documentation/tools/containerfiles/Containerfile.dnf
similarity index 100%
rename from documentation/tools/Containerfile.dnf
rename to documentation/tools/containerfiles/Containerfile.dnf
diff --git a/documentation/tools/Containerfile.fedora b/documentation/tools/containerfiles/Containerfile.fedora
similarity index 100%
rename from documentation/tools/Containerfile.fedora
rename to documentation/tools/containerfiles/Containerfile.fedora
diff --git a/documentation/tools/Containerfile.ubuntu b/documentation/tools/containerfiles/Containerfile.ubuntu
similarity index 100%
rename from documentation/tools/Containerfile.ubuntu
rename to documentation/tools/containerfiles/Containerfile.ubuntu
diff --git a/documentation/tools/Containerfile.zypper b/documentation/tools/containerfiles/Containerfile.zypper
similarity index 100%
rename from documentation/tools/Containerfile.zypper
rename to documentation/tools/containerfiles/Containerfile.zypper

--
2.51.0