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

attempt to fix chown issue

Browse Source
This commit is contained in:
Levon Gevorgyan
2025-11-01 16:03:03 -05:00
parent 4065cff08c
commit afc4ca05cb
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/docker.sh
View File

@@ -141,40 +141,47 @@ docker_build_image() {
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 fi
local openPerms='sudo -E -u nobody -g nogroup'
echo 'RUN chmod 777 -R /root/'
# pipx # pipx
echo 'RUN pipx install virtualenv' echo "RUN ${openPerms} pipx install virtualenv"
echo 'RUN pipx ensurepath' echo "RUN ${openPerms} pipx ensurepath"
# rust # rust
echo 'ENV CARGO_HOME="/root/.cargo"' echo 'ENV CARGO_HOME="/root/.cargo"'
echo 'ENV RUSTUP_HOME="/root/.rustup"' echo 'ENV RUSTUP_HOME="/root/.rustup"'
echo 'ENV PATH="/root/.cargo/bin:$PATH"' echo 'ENV PATH="/root/.cargo/bin:$PATH"'
local rustupVersion='1.28.2' local rustupVersion='1.28.2'
local rustcVersion='1.88.0' local rustcVersion='1.88.0'
local rustupTarball="${DOCKER_DIR}/rustup.tar.gz" local rustupTarball="rustup-${rustupVersion}.tar.gz"
if [[ ! -f ${rustupTarball} ]]; then local rustupTarballPath="${DOCKER_DIR}/${rustupTarball}"
wget https://github.com/rust-lang/rustup/archive/refs/tags/${rustupVersion}.tar.gz -O "${rustupTarball}" if [[ ! -f ${rustupTarballPath} ]]; then
wget https://github.com/rust-lang/rustup/archive/refs/tags/${rustupVersion}.tar.gz -O "${rustupTarballPath}"
fi fi
echo "ADD ./rustup.tar.gz /tmp/" echo "ADD ${rustupTarball} /tmp/"
local cargoInst='' local cargoInst="\
cargoInst+="cd /tmp/rustup-${rustupVersion}" cd /tmp/rustup-${rustupVersion} \
cargoInst+=" && bash rustup-init.sh -y --default-toolchain=${rustcVersion}" && ${openPerms} bash rustup-init.sh -y --default-toolchain=${rustcVersion} \
cargoInst+=" && rm -rf /tmp/*" && rm -rf /tmp/*"
echo "RUN ${cargoInst}" echo "RUN ${cargoInst}"
# add to profile
echo 'RUN export CARGO_HOME=${CARGO_HOME} >> /etc/profile'
echo 'RUN export RUSTUP_HOME=${RUSTUP_HOME} >> /etc/profile'
echo 'RUN export PATH=${PATH} >> /etc/profile'
# install cargo-binstall # install cargo-binstall
echo "RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash" echo "RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | ${openPerms} bash -l"
# install cargo-c # install cargo-c
echo "RUN cargo-binstall -y cargo-c" echo "RUN ${openPerms} bash -l -c 'cargo-binstall -y cargo-c'"
# since any user may run this image, # since any user may run this image,
# open up root tools to everyone # open up root tools to everyone
echo 'ENV PATH="/root/.local/bin:$PATH"' echo 'ENV PATH="/root/.local/bin:$PATH"'
echo 'RUN chmod 777 -R /root/'
echo "WORKDIR ${DOCKER_WORKDIR}" echo "WORKDIR ${DOCKER_WORKDIR}"
} >"${dockerfile}" } >"${dockerfile}"
image_tag="$(set_distro_image_tag "${image}")" image_tag="$(set_distro_image_tag "${image}")"
docker buildx build \ docker buildx build \
--load \
--platform "${PLATFORM}" \ --platform "${PLATFORM}" \
-t "${image_tag}" \ -t "${image_tag}" \
-f "${dockerfile}" \ -f "${dockerfile}" \
@@ -188,7 +195,7 @@ docker_build_image() {
--platform "${PLATFORM}" \ --platform "${PLATFORM}" \
-t "${DOCKER_REGISTRY}/${image_tag}" \ -t "${DOCKER_REGISTRY}/${image_tag}" \
-f "${dockerfile}" \ -f "${dockerfile}" \
. || return 1 "${DOCKER_DIR}" || return 1
fi fi
# FIXME uncomment # FIXME uncomment