diff --git a/docker/Dockerfile b/docker/Dockerfile index 2fa290e5..a5b68b59 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,11 +30,12 @@ RUN mkdir -p /config && \ aria2c --version && \ # Install phantomjs if using x86_64, ensure it is properly installed if [[ $(uname -m) == "x86_64" ]]; then \ + echo "installing phantomjs" && \ apk add --no-cache gcompat && \ - cd /usr/share && \ - curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar xj && \ - mv /usr/share/phantomjs-2.1.1-linux-x86_64/bin/phantomjs phantomjs && \ - rm -rf /usr/share/phantomjs-2.1.1-linux-x86_64 && \ + tar -xjvf /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ + mv phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/share/phantomjs && \ + rm -rf phantomjs-2.1.1-linux-x86_64 && \ + rm /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ ln -s /usr/share/phantomjs /usr/bin/phantomjs && \ echo "Phantom JS version:" && \ phantomjs --version && \ diff --git a/docker/Dockerfile.gui b/docker/Dockerfile.gui index 9425c7ec..dd04e318 100644 --- a/docker/Dockerfile.gui +++ b/docker/Dockerfile.gui @@ -51,11 +51,11 @@ RUN mkdir -p /config && \ ffmpeg -version && \ # Install phantomjs if using x86_64, ensure it is properly installed if [[ $(uname -m) == "x86_64" ]]; then \ - curl -L -o phantomjs.tar.bz2 https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ - tar -xvf phantomjs.tar.bz2 && \ + echo "installing phantomjs" && \ + tar -xjvf /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ mv phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs && \ - rm -rf phantomjs-2.1.1-linux-x86_64/ && \ - rm phantomjs.tar.bz2 && \ + rm -rf phantomjs-2.1.1-linux-x86_64 && \ + rm /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ echo "Phantom JS version:" && \ phantomjs --version ; \ fi && \ diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index 6036249f..de7dce0f 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -54,11 +54,11 @@ RUN mkdir -p /config && \ ffmpeg -version && \ # Install phantomjs if using x86_64, ensure it is properly installed if [[ $(uname -m) == "x86_64" ]]; then \ - curl -L -o phantomjs.tar.bz2 https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ - tar -xvf phantomjs.tar.bz2 && \ + echo "installing phantomjs" && \ + tar -xjvf /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ mv phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs && \ - rm -rf phantomjs-2.1.1-linux-x86_64/ && \ - rm phantomjs.tar.bz2 && \ + rm -rf phantomjs-2.1.1-linux-x86_64 && \ + rm /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \ echo "Phantom JS version:" && \ phantomjs --version ; \ fi && \ diff --git a/docker/root/defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 b/docker/root/defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 new file mode 100644 index 00000000..0281fb85 Binary files /dev/null and b/docker/root/defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 differ diff --git a/pyproject.toml b/pyproject.toml index def7bea1..7e74df1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", ] dependencies = [ - "yt-dlp[default]==2025.5.22", + "yt-dlp[default]==2025.6.9", "colorama~=0.4", "mergedeep~=1.3", "mediafile~=0.12",