levogevo/ffmpeg-builder
1
0
Fork 0
mirror of https://github.com/levogevo/ffmpeg-builder.git synced 2026-03-16 11:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

small fixup for building images

Browse Source
This commit is contained in:
Levon Gevorgyan
2026-01-23 11:13:39 -06:00
parent 38c160e2bd
commit c1d4617145
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/docker.sh
View File

@@ -116,7 +116,7 @@ docker_build_image() {
docker run \ docker run \
"${DOCKER_RUN_FLAGS[@]}" \ "${DOCKER_RUN_FLAGS[@]}" \
"${dockerDistro}" \ "${dockerDistro}" \
bash -c "./scripts/print_pkg_mgr.sh" | tr -d '\r' >"${distroPkgMgr}" bash -c "DEBUG=0 ./scripts/print_pkg_mgr.sh" | tr -d '\r' >"${distroPkgMgr}"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
cat "${distroPkgMgr}" cat "${distroPkgMgr}"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
@@ -269,8 +269,8 @@ docker_run_image() {
# if a docker registry is defined, pull from it # if a docker registry is defined, pull from it
if [[ ${DOCKER_REGISTRY} != '' ]]; then if [[ ${DOCKER_REGISTRY} != '' ]]; then
docker_login || return 1 echo_if_fail docker_login || return 1
docker pull \ echo_if_fail docker pull \
"${DOCKER_REGISTRY}/${image_tag}" || return 1 "${DOCKER_REGISTRY}/${image_tag}" || return 1
docker tag "${DOCKER_REGISTRY}/${image_tag}" "${image_tag}" docker tag "${DOCKER_REGISTRY}/${image_tag}" "${image_tag}"
fi fi
@@ -283,7 +283,7 @@ docker_run_image() {
"${runCmd[@]}" "${runCmd[@]}"
local rv=$? local rv=$?
docker image prune -f echo_if_fail docker image prune -f
return ${rv} return ${rv}
} }