small updates

This commit is contained in:
2025-07-29 19:06:01 -05:00
parent 4d275482ef
commit 462606006c
3 changed files with 14 additions and 9 deletions

2
Jenkinsfile vendored
View File

@@ -7,7 +7,7 @@ pipeline {
axes { axes {
axis { axis {
name 'DISTRO' name 'DISTRO'
values 'debian:bookworm', 'ubuntu:24.04', 'archlinux:latest', 'fedora:42' values 'debian:bookworm', 'ubuntu:24.04', 'archlinuxarm:latest', 'fedora:42'
} }
} }
stages { stages {

View File

@@ -2,9 +2,13 @@
validate_selected_distro() { validate_selected_distro() {
local selectedDistro="${1:-}" local selectedDistro="${1:-}"
local validDistros=('debian:bookworm' 'ubuntu:24.04' 'archlinux:latest' 'fedora:42') local validDistros=(
'debian:bookworm' 'ubuntu:24.04'
'archlinux:latest' 'archlinuxarm'
'fedora:42'
)
for distro in "${validDistros[@]}"; do for distro in "${validDistros[@]}"; do
if [[ ${selectedDistro} == ${distro} ]]; then if [[ ${selectedDistro} == "${distro}" ]]; then
DISTROS+=("${distro}") DISTROS+=("${distro}")
fi fi
done done
@@ -16,11 +20,11 @@ validate_selected_distro() {
} }
# shellcheck disable=SC2154 # shellcheck disable=SC2154
FB_FUNC_NAMES+=('docker_build_images') FB_FUNC_NAMES+=('docker_build_image')
# FB_FUNC_DESCS used externally # FB_FUNC_DESCS used externally
# shellcheck disable=SC2034 # shellcheck disable=SC2034
FB_FUNC_DESCS['docker_build_images']='build docker images with required dependencies pre-installed' FB_FUNC_DESCS['docker_build_image']='build docker image with required dependencies pre-installed'
docker_build_images() { docker_build_image() {
validate_selected_distro "$@" || return 1 validate_selected_distro "$@" || return 1
DOCKERFILE_DIR="${IGN_DIR}/Dockerfiles" DOCKERFILE_DIR="${IGN_DIR}/Dockerfiles"
test -d "${DOCKERFILE_DIR}" && rm -rf "${DOCKERFILE_DIR}" test -d "${DOCKERFILE_DIR}" && rm -rf "${DOCKERFILE_DIR}"
@@ -34,7 +38,7 @@ docker_build_images() {
# specific file for evaluated package manager info # specific file for evaluated package manager info
distroFmtPkgMgr="${DOCKERFILE_DIR}/${distroFmt}-pkg_mgr" distroFmtPkgMgr="${DOCKERFILE_DIR}/${distroFmt}-pkg_mgr"
# get package manager info # get package manager info
docker run --rm -it \ docker run --rm \
-v "${REPO_DIR}":/workdir \ -v "${REPO_DIR}":/workdir \
-w /workdir \ -w /workdir \
"${distro}" \ "${distro}" \
@@ -64,6 +68,7 @@ docker_build_images() {
-t "${image_tag}" \ -t "${image_tag}" \
-f "${dockerfile}" \ -f "${dockerfile}" \
. || return 1 . || return 1
docker system prune -f
done done
} }
@@ -71,13 +76,13 @@ docker_build_images() {
FB_FUNC_NAMES+=('docker_run_image') FB_FUNC_NAMES+=('docker_run_image')
# FB_FUNC_DESCS used externally # FB_FUNC_DESCS used externally
# shellcheck disable=SC2034 # shellcheck disable=SC2034
FB_FUNC_DESCS['docker_run_image']='run docker images to build ffmpeg' FB_FUNC_DESCS['docker_run_image']='run docker image to build ffmpeg'
docker_run_image() { docker_run_image() {
docker_build_images "$@" || return 1 docker_build_images "$@" || return 1
for distro in "${DISTROS[@]}"; do for distro in "${DISTROS[@]}"; do
image_tag="ffmpeg_builder_${distro}" image_tag="ffmpeg_builder_${distro}"
echo_info "running ffmpeg build for ${image_tag}" echo_info "running ffmpeg build for ${image_tag}"
docker run --rm -it \ docker run --rm \
-v "${REPO_DIR}":/workdir \ -v "${REPO_DIR}":/workdir \
-w /workdir \ -w /workdir \
"${image_tag}" \ "${image_tag}" \