diff --git a/docker/Dockerfile b/docker/Dockerfile index 9f8e923a..ffadc3c9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -54,8 +54,7 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \ apk del \ g++ \ make \ - libffi-dev \ - py3-setuptools + libffi-dev ############################################################################### # CONTAINER CONFIGS diff --git a/docker/Dockerfile.gui b/docker/Dockerfile.gui index 117dfb64..98f1b3cc 100644 --- a/docker/Dockerfile.gui +++ b/docker/Dockerfile.gui @@ -66,7 +66,7 @@ RUN mkdir -p /config && \ curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh -s -- -y --no-modify-path && \ deno --help && # Install ytdl-sub, ensure it is installed properly - pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \ + python3 -m pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \ ytdl-sub -h && \ # Delete unneeded packages after install rm ytdl_sub-*.whl && \ diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index f06d3f7a..e6c432f0 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -69,7 +69,7 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \ curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh -s -- -y --no-modify-path && \ deno --help && # Install ytdl-sub, ensure it is installed properly - pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \ + python3 -m pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \ ytdl-sub -h && \ # Delete unneeded packages after install rm ytdl_sub-*.whl && \ diff --git a/docker/root/custom-cont-init.d/defaults b/docker/root/custom-cont-init.d/defaults index 343e62c8..7fdd138c 100644 --- a/docker/root/custom-cont-init.d/defaults +++ b/docker/root/custom-cont-init.d/defaults @@ -28,14 +28,14 @@ echo "" > "$LOGS_TO_STDOUT" # https://github.com/yt-dlp/yt-dlp/wiki/Installation#with-pip if [ "$UPDATE_YT_DLP_ON_START" == "stable" ] ; then echo "UPDATE_YT_DLP_ON_START is set to stable, attempting to update to a new stable version of yt-dlp if it exists." - python3 -m pip install -U "yt-dlp[default]" --break-system-packages + python3 -m pip install -U "yt-dlp[default]" --break-system-packages --root-user-action elif [ "$UPDATE_YT_DLP_ON_START" == "nightly" ] ; then echo "UPDATE_YT_DLP_ON_START is set to nightly, attempting to update to the latest nightly version of yt-dlp." - python3 -m pip install -U --pre "yt-dlp[default]" + python3 -m pip install -U --pre "yt-dlp[default]" --root-user-action elif [ "$UPDATE_YT_DLP_ON_START" == "master" ] ; then echo "UPDATE_YT_DLP_ON_START is set to master, pulling yt-dlp's latest commit for install." - python3 -m pip install -U pip hatchling wheel - python3 -m pip install --force-reinstall "yt-dlp[default] @ https://github.com/yt-dlp/yt-dlp/archive/master.tar.gz" + python3 -m pip install -U pip hatchling wheel --root-user-action + python3 -m pip install --force-reinstall "yt-dlp[default] @ https://github.com/yt-dlp/yt-dlp/archive/master.tar.gz" --root-user-action else echo "UPDATE_YT_DLP_ON_START is not set, using packaged version." fi