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

slight oversight

Browse Source
This commit is contained in:
Levon Gevorgyan
2025-12-19 23:14:36 -06:00
parent 7419027a80
commit 2356e05ad5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/docker.sh
View File

@@ -174,9 +174,11 @@ docker_build_image() {
echo "RUN cargo-binstall -y cargo-c" echo "RUN cargo-binstall -y cargo-c"
# final mods for PS1 # final mods for PS1
echo
echo 'USER root' echo 'USER root'
echo "RUN echo \"PS1='id=\\\$(id -u)@${image}:\w\\$ '\" >> /etc/bash.bashrc" echo "RUN echo \"PS1='id=\\\$(id -u)@${image}:\w\\$ '\" >> /etc/bash.bashrc"
echo 'USER 65534:65534' echo 'USER 65534:65534'
echo
# embed dockerfile into docker image itself # embed dockerfile into docker image itself
# shellcheck disable=SC2094 # shellcheck disable=SC2094
@@ -243,8 +245,7 @@ docker_load_image() {
echo_info "loading docker image for ${image_tag}" echo_info "loading docker image for ${image_tag}"
local archive="${DOCKER_DIR}/$(docker_image_archive_name "${image_tag}")" local archive="${DOCKER_DIR}/$(docker_image_archive_name "${image_tag}")"
test -f "$archive" || return 1 test -f "$archive" || return 1
zstdcat -T0 "$archive" | zstdcat -T0 "$archive" | docker load || return 1
docker load || return 1
docker system prune -f docker system prune -f
} }
@@ -281,6 +282,10 @@ docker_run_image() {
-u "$(id -u):$(id -g)" \ -u "$(id -u):$(id -g)" \
"${image_tag}" \ "${image_tag}" \
"${runCmd[@]}" "${runCmd[@]}"
local rv=$?
docker image prune -f
return ${rv}
} }
FB_FUNC_NAMES+=('build_with_docker') FB_FUNC_NAMES+=('build_with_docker')