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

more rando fixes

Browse Source
This commit is contained in:
Levon Gevorgyan
2025-08-11 17:45:42 -05:00
parent 722d4757ed
commit f68eaba7d4
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/docker.sh
View File

@@ -92,13 +92,13 @@ docker_build_image() {
docker run \ docker run \
"${DOCKER_RUN_FLAGS[@]}" \ "${DOCKER_RUN_FLAGS[@]}" \
"${dockerDistro}" \ "${dockerDistro}" \
rm -rf "${DOCKER_WORKDIR}"/gitignore chown -R "$(id -u):$(id -g)" "${DOCKER_WORKDIR}"/gitignore
fi fi
if ! echo_if_fail ls; then if ! echo_if_fail ls; then
docker run \ docker run \
"${DOCKER_RUN_FLAGS[@]}" \ "${DOCKER_RUN_FLAGS[@]}" \
"${dockerDistro}" \ "${dockerDistro}" \
rm -rf "${DOCKER_WORKDIR}"/gitignore chown -R "$(id -u):$(id -g)" "${DOCKER_WORKDIR}"/gitignore
fi fi
docker run \ docker run \
@@ -115,9 +115,19 @@ docker_build_image() {
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'
# arch is rolling release, so highly likely
# an updated is required between pkg changes
if line_contains "${dockerDistro}" 'archlinux'; then
local archRuns=''
archRuns+="${pkg_mgr_update}"
archRuns+=" && ${pkg_mgr_upgrade}"
archRuns+=" && ${pkg_install} ${req_pkgs[*]}"
echo "RUN ${archRuns}"
else
echo "RUN ${pkg_mgr_update}" echo "RUN ${pkg_mgr_update}"
echo "RUN ${pkg_mgr_upgrade}" echo "RUN ${pkg_mgr_upgrade}"
printf "RUN ${pkg_install} %s\n" "${req_pkgs[@]}" printf "RUN ${pkg_install} %s\n" "${req_pkgs[@]}"
fi
echo 'RUN pipx install virtualenv' echo 'RUN pipx install virtualenv'
echo 'RUN pipx ensurepath' echo 'RUN pipx ensurepath'
echo 'ENV CARGO_HOME="/root/.cargo"' echo 'ENV CARGO_HOME="/root/.cargo"'
@@ -205,20 +215,20 @@ docker_run_image() {
docker run \ docker run \
"${DOCKER_RUN_FLAGS[@]}" \ "${DOCKER_RUN_FLAGS[@]}" \
"${image_tag}" \ "${image_tag}" \
rm -rf "${DOCKER_WORKDIR}"/gitignore chown -R "$(id -u):$(id -g)" "${DOCKER_WORKDIR}"/gitignore
fi fi
if ! echo_if_fail ls; then if ! echo_if_fail ls; then
docker run \ docker run \
"${DOCKER_RUN_FLAGS[@]}" \ "${DOCKER_RUN_FLAGS[@]}" \
"${image_tag}" \ "${image_tag}" \
rm -rf "${DOCKER_WORKDIR}"/gitignore chown -R "$(id -u):$(id -g)" "${DOCKER_WORKDIR}"/gitignore
fi fi
testfile="${PREFIX}/ffmpeg-build-testfile" testfile="${PREFIX}/ffmpeg-build-testfile"
if ! touch "${testfile}" 2>/dev/null; then if ! touch "${testfile}" 2>/dev/null; then
docker run \ docker run \
"${DOCKER_RUN_FLAGS[@]}" \ "${DOCKER_RUN_FLAGS[@]}" \
"${image_tag}" \ "${image_tag}" \
rm -rf "${DOCKER_WORKDIR}"/gitignore chown -R "$(id -u):$(id -g)" "${DOCKER_WORKDIR}"/gitignore
fi fi
# if a docker registry is defined, pull from it # if a docker registry is defined, pull from it