diff --git a/docker/Dockerfile b/docker/Dockerfile index 558f75dc..53f04090 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,8 +46,10 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \ phantomjs --version && \ cd -; \ fi && \ + # Configure pip globally + echo -e "[global]\nbreak-system-packages = true\nroot-user-action = ignore\nno-cache-dir = true" > /etc/pip.conf && \ # Install ytdl-sub, ensure it is installed properly - python3 -m pip install --break-system-packages --no-cache-dir ytdl_sub-*.whl && \ + python3 -m pip install ytdl_sub-*.whl && \ ytdl-sub -h && \ # Delete unneeded packages after install rm ytdl_sub-*.whl && \ diff --git a/docker/Dockerfile.gui b/docker/Dockerfile.gui index 11a31d6c..3b89252b 100644 --- a/docker/Dockerfile.gui +++ b/docker/Dockerfile.gui @@ -65,8 +65,10 @@ RUN mkdir -p /config && \ # Install Deno, required for YouTube downloads curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh -s -- -y --no-modify-path && \ deno --help && \ + # Configure pip globally + echo -e "[global]\nbreak-system-packages = true\nroot-user-action = ignore\nno-cache-dir = true" > /etc/pip.conf && \ # Install ytdl-sub, ensure it is installed properly - python3 -m pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \ + python3 -m pip install 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 b2de4019..5199c8ec 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -68,8 +68,10 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \ # Install Deno, required for YouTube downloads curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh -s -- -y --no-modify-path && \ deno --help && \ + # Configure pip globally + echo -e "[global]\nbreak-system-packages = true\nroot-user-action = ignore\nno-cache-dir = true" > /etc/pip.conf && \ # Install ytdl-sub, ensure it is installed properly - python3 -m pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \ + python3 -m pip install 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 0dcbc36d..3fd4c22d 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 --root-user-action=ignore + python3 -m pip install -U "yt-dlp[default]" 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]" --root-user-action=ignore + python3 -m pip install -U --pre "yt-dlp[default]" 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 --root-user-action=ignore - python3 -m pip install --force-reinstall "yt-dlp[default] @ https://github.com/yt-dlp/yt-dlp/archive/master.tar.gz" --root-user-action=ignore + 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" else echo "UPDATE_YT_DLP_ON_START is not set, using packaged version." fi