get docker working

2026-01-15 19:06:17 +00:00 · 2025-07-28 19:03:56 -05:00
parent 1ee24a8b6a
commit 5f797dad30
9 changed files with 152 additions and 46 deletions
--- a/lib/build.sh
+++ b/lib/build.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash

 set_compile_opts() {
+	test "$FB_COMPILE_OPTS_SET" == 0 && return 0
+
 	unset LDFLAGS C_FLAGS CXX_FLAGS CPP_FLAGS \
 		CONFIGURE_FLAGS MESON_FLAGS \
 		RUSTFLAGS CMAKE_FLAGS \
@@ -137,6 +139,8 @@ set_compile_opts() {
 		export SUDO_CARGO="${SUDO} --preserve-env=PATH,RUSTUP_HOME,CARGO_HOME"
 	fi
 	echo
+
+	FB_COMPILE_OPTS_SET=1
 }

 get_build_conf() {
@@ -255,6 +259,7 @@ do_build() {
 	local build="${1:-''}"
 	download_release "${build}" || return 1
 	get_build_conf "${build}" || return 1
+	set_compile_opts || return 1
 	for dep in "${deps[@]}"; do
 		do_build "${dep}" || return 1
 	done
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -123,7 +123,3 @@ bash_basename() {

 	printf '%s\n' "${tmp:-/}"
 }
-
-fb_running_as_script() {
-	return "$FB_RUNNING_AS_SCRIPT"
-}
--- a/lib/docker.sh
+++ b/lib/docker.sh
@@ -1,26 +1,90 @@
 #!/usr/bin/env bash

+# shellcheck disable=SC2154
 FB_FUNC_NAMES+=('docker_build_images')
 # FB_FUNC_DESCS used externally
 # shellcheck disable=SC2034
 FB_FUNC_DESCS['docker_build_images']='build docker images with required dependencies pre-installed'
 docker_build_images() {
-	DISTROS=(debian ubuntu archlinux fedora)
+	DISTROS=('debian:bookworm' 'ubuntu:24.04' 'archlinux:latest' 'fedora:42')
+	# DISTROS=('debian:bookworm')
 	DOCKERFILE_DIR="${IGN_DIR}/Dockerfiles"
-	test -d "${DOCKERFILE_DIR}" || mkdir -p "${DOCKERFILE_DIR}"
+	test -d "${DOCKERFILE_DIR}" && rm -rf "${DOCKERFILE_DIR}"
+	mkdir -p "${DOCKERFILE_DIR}"
 	for distro in "${DISTROS[@]}"; do
-		echo "\
-FROM ${distro}
-COPY scripts/ /ffmpeg-builder/scripts/
-COPY main.sh /ffmpeg-builder/
-RUN bash -c 'source /ffmpeg-builder/main.sh ; install_deps' || exit 1" \
-			>"${DOCKERFILE_DIR}/Dockerfile_${distro}"
 		image_tag="ffmpeg_builder_${distro}"
-		dockerfile="Dockerfile_${distro}"
+		echo_info "source package manager for ${image_tag}"
+
+		# distro without problematic characters
+		distroFmt="${distro//:/-}"
+		# specific file for evaluated package manager info
+		distroFmtPkgMgr="${DOCKERFILE_DIR}/${distroFmt}-pkg_mgr"
+		# get package manager info
+		docker run --rm -it \
+			-v "${REPO_DIR}":/workdir \
+			-w /workdir \
+			"${distro}" \
+			bash -c "./scripts/print_pkg_mgr.sh" | tr -d '\r' >"${distroFmtPkgMgr}"
+		# shellcheck disable=SC1090
+		source "${distroFmtPkgMgr}"
+
+		dockerfile="${DOCKERFILE_DIR}/Dockerfile_${distroFmt}"
+		{
+			echo "FROM ${distro}"
+			echo 'SHELL ["/bin/bash", "-c"]'
+			echo "RUN ${pkg_mgr_update} && ${pkg_mgr_upgrade}"
+			echo "RUN ${pkg_install} ${req_pkgs}"
+		} >"${dockerfile}"
+
 		echo_info "building ${image_tag}"
 		docker build \
 			-t "${image_tag}" \
-			-f "${DOCKERFILE_DIR}/${dockerfile}" \
-			"${REPO_DIR}/"
+			-f "${dockerfile}" \
+			.
+	done
+}
+
+# shellcheck disable=SC2154
+FB_FUNC_NAMES+=('docker_run_image')
+# FB_FUNC_DESCS used externally
+# shellcheck disable=SC2034
+FB_FUNC_DESCS['docker_run_image']='run docker images to build ffmpeg'
+docker_run_image() {
+	DISTROS=('debian:bookworm' 'ubuntu:24.04' 'archlinux:latest' 'fedora:42')
+	# DISTROS=('debian:bookworm')
+	DOCKERFILE_DIR="${IGN_DIR}/Dockerfiles"
+	test -d "${DOCKERFILE_DIR}" && rm -rf "${DOCKERFILE_DIR}"
+	mkdir -p "${DOCKERFILE_DIR}"
+	for distro in "${DISTROS[@]}"; do
+		image_tag="ffmpeg_builder_${distro}"
+		echo_info "source package manager for ${image_tag}"
+
+		# distro without problematic characters
+		distroFmt="${distro//:/-}"
+		# specific file for evaluated package manager info
+		distroFmtPkgMgr="${DOCKERFILE_DIR}/${distroFmt}-pkg_mgr"
+		# get package manager info
+		docker run --rm -it \
+			-v "${REPO_DIR}":/workdir \
+			-w /workdir \
+			"${distro}" \
+			bash -c "./scripts/print_pkg_mgr.sh" | tr -d '\r' >"${distroFmtPkgMgr}"
+		# shellcheck disable=SC1090
+		source "${distroFmtPkgMgr}"
+		cat "${distroFmtPkgMgr}"
+
+		dockerfile="${DOCKERFILE_DIR}/Dockerfile_${distroFmt}"
+		{
+			echo "FROM ${distro}"
+			echo 'SHELL ["/bin/bash", "-c"]'
+			echo "RUN ${pkg_mgr_update} && ${pkg_mgr_upgrade}"
+			echo "RUN ${pkg_install} ${req_pkgs}"
+		} >"${dockerfile}"
+
+		echo_info "building ${image_tag}"
+		docker build \
+			-t "${image_tag}" \
+			-f "${dockerfile}" \
+			.
 	done
 }
--- a/lib/install_deps.sh
+++ b/lib/install_deps.sh
@@ -1,23 +1,24 @@
 #!/usr/bin/env bash

+# shellcheck disable=SC2120
 determine_pkg_mgr() {
 	# sudo used externally
 	# shellcheck disable=SC2034
-	test "$(id -u)" -eq 0 && SUDO='' || SUDO=sudo
+	test "$(id -u)" -eq 0 && SUDO='' || SUDO='sudo '

-	# pkg-mgr update-cmd install-cmd check-cmd
+	# pkg-mgr update-cmd upgrade-cmd install-cmd check-cmd
 	# shellcheck disable=SC2016
 	local PKG_MGR_MAP='
-brew:brew update:brew install:brew list --formula ${pkg}
-apt-get:${SUDO} apt-get update: ${SUDO} apt-get install -y:dpkg -l ${pkg}
-pacman:${SUDO} pacman -Syy:${SUDO} pacman -S --noconfirm --needed:pacman -Qi ${pkg}
-dnf:${SUDO} dnf check-update:${SUDO} dnf install -y:dnf list -q --installed ${pkg}
+brew:brew update:brew upgrade:brew install:brew list --formula ${pkg}
+apt-get:${SUDO}apt-get update:${SUDO}apt-get upgrade -y:${SUDO}apt-get install -y:dpkg -l ${pkg}
+pacman:${SUDO}pacman -Syy:${SUDO}pacman -Syu --noconfirm:${SUDO}pacman -S --noconfirm --needed:pacman -Qi ${pkg}
+dnf:${SUDO}dnf check-update || true:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg}
 '
 	local supported_pkg_mgr=()
-	unset pkg_mgr pkg_mgr_update pkg_install pkg_check
+	unset pkg_mgr pkg_mgr_update pkg_mgr_upgrade pkg_install pkg_check
 	while read -r line; do
 		test "${line}" == '' && continue
-		IFS=':' read -r pkg_mgr pkg_mgr_update pkg_install pkg_check <<<"${line}"
+		IFS=':' read -r pkg_mgr pkg_mgr_update pkg_mgr_upgrade pkg_install pkg_check <<<"${line}"
 		supported_pkg_mgr+=("${pkg_mgr}")
 		if ! has_cmd "${pkg_mgr}"; then
 			pkg_mgr=''
@@ -25,6 +26,7 @@ dnf:${SUDO} dnf check-update:${SUDO} dnf install -y:dnf list -q --installed ${pk
 		fi
 		# update/install may use SUDO
 		eval "pkg_mgr_update=\"${pkg_mgr_update}\""
+		eval "pkg_mgr_upgrade=\"${pkg_mgr_upgrade}\""
 		eval "pkg_install=\"${pkg_install}\""
 		break
 	done <<<"${PKG_MGR_MAP}"
@@ -37,8 +39,7 @@ dnf:${SUDO} dnf check-update:${SUDO} dnf install -y:dnf list -q --installed ${pk
 	return 0
 }

-check_for_req_pkgs() {
-	echo_info "checking for required packages"
+print_req_pkgs() {
 	local common_pkgs=(
 		autoconf automake cmake libtool
 		texinfo nasm yasm python3
@@ -77,8 +78,27 @@ check_for_req_pkgs() {

 	local req_pkgs_env_name="${pkg_mgr/-/_}_pkgs"
 	declare -n req_pkgs="${req_pkgs_env_name}"
+	echo "${req_pkgs[@]}"
+}
+
+FB_FUNC_NAMES+=('print_pkg_mgr')
+# FB_FUNC_DESCS used externally
+# shellcheck disable=SC2034
+FB_FUNC_DESCS['print_pkg_mgr']='print out evaluated package manager commands and required packages'
+print_pkg_mgr() {
+	determine_pkg_mgr || return 1
+	echo "export pkg_mgr=\"${pkg_mgr}\""
+	echo "export pkg_mgr_update=\"${pkg_mgr_update}\""
+	echo "export pkg_mgr_upgrade=\"${pkg_mgr_upgrade}\""
+	echo "export pkg_install=\"${pkg_install}\""
+	echo "export pkg_check=\"${pkg_check}\""
+	echo "export req_pkgs=\"$(print_req_pkgs)\""
+}
+
+check_for_req_pkgs() {
+	echo_info "checking for required packages"
 	local missing_pkgs=()
-	for pkg in "${req_pkgs[@]}"; do
+	for pkg in $(print_req_pkgs); do
 		# pkg_check has ${pkg} unexpanded
 		eval "pkg_check=\"${pkg_check}\""
 		${pkg_check} "${pkg}" >/dev/null 2>&1 || missing_pkgs+=("${pkg}")