levogevo/ffmpeg-builder
1
0
Fork 0
mirror of https://github.com/levogevo/ffmpeg-builder.git synced 2026-01-15 19:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for build

Browse Source
This commit is contained in:
Levon Gevorgyan
2025-08-03 11:19:21 -05:00
parent 6ab9e7123d
commit 85cab95a05
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/docker.sh
View File

@@ -52,24 +52,24 @@ docker_build_image() {
image_tag="$(set_distro_image_tag "${distro}")" image_tag="$(set_distro_image_tag "${distro}")"
echo_info "sourcing package manager for ${image_tag}" echo_info "sourcing package manager for ${image_tag}"
# distro without problematic characters # docker expects colon instead of dash
distroFmt="${distro//:/-}" dockerDistro="${distro//-/:}"
# specific file for evaluated package manager info # specific file for evaluated package manager info
distroFmtPkgMgr="${DOCKER_DIR}/${distroFmt}-pkg_mgr" distroPkgMgr="${DOCKER_DIR}/${distro}-pkg_mgr"
# get package manager info # get package manager info
docker run --rm \ docker run --rm \
--platform "${platform}" \ --platform "${platform}" \
-v "${REPO_DIR}":/workdir \ -v "${REPO_DIR}":/workdir \
-w /workdir \ -w /workdir \
"${distro}" \ "${dockerDistro}" \
bash -c "./scripts/print_pkg_mgr.sh" | tr -d '\r' >"${distroFmtPkgMgr}" bash -c "./scripts/print_pkg_mgr.sh" | tr -d '\r' >"${distroPkgMgr}"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
cat "${distroFmtPkgMgr}" cat "${distroPkgMgr}"
source "${distroFmtPkgMgr}" source "${distroPkgMgr}"
dockerfile="${DOCKER_DIR}/Dockerfile_${distroFmt}" dockerfile="${DOCKER_DIR}/Dockerfile_${distro}"
{ {
echo "FROM ${distro}" echo "FROM ${dockerDistro}"
echo 'SHELL ["/bin/bash", "-c"]' echo 'SHELL ["/bin/bash", "-c"]'
echo 'RUN ln -sf /bin/bash /bin/sh' echo 'RUN ln -sf /bin/bash /bin/sh'
echo 'ENV DEBIAN_FRONTEND=noninteractive' echo 'ENV DEBIAN_FRONTEND=noninteractive'