From f713d720e4b632445560c54d89b2d7babf7b845b Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Mon, 20 Feb 2023 09:36:41 -0800 Subject: [PATCH] [DOCKER] Upgrade ffmpeg, add phantomjs (#448) * [DOCKER] Upgrade ffmpeg, add phantomjs * only install phantomjs for x86 * lint --- docker/Dockerfile | 29 ++++++++++++++++++++--------- tests/e2e/plugins/test_chapters.py | 1 + 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6ec12c48..56d8f2c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,26 +1,37 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.16 +FROM ghcr.io/linuxserver/baseimage-alpine:3.17 ############################################################################### # YTDL-SUB INSTALL COPY root/ / -RUN apk update --no-cache && \ +RUN mkdir -p /config && \ + apk update --no-cache && \ apk upgrade --no-cache && \ - apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/main/ \ + apk add --no-cache --repository=http://dl-3.alpinelinux.org/alpine/edge/main/ \ vim \ g++ \ nano \ make \ - ffmpeg \ python3=~3.10 \ py3-pip \ + fontconfig \ py3-setuptools && \ - mkdir -p /config && \ - # Ensure ffmpeg is installed property - ffmpeg -version && \ - # Install ytdl-sub, ensure it is installed propertly + # Install edge ffmpeg, ensure it is properly installed + apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ + ffmpeg=5.1.2-r8 && \ + ffmpeg -version && \ + # Install phantomjs if using x86_64, ensure it is properly installed + if [[ $(uname -m) == "x86_64" ]]; then \ + cd /usr/share && \ + curl -L https://github.com/Overbryd/docker-phantomjs-alpine/releases/download/2.11/phantomjs-alpine-x86_64.tar.bz2 | tar xj && \ + ln -s /usr/share/phantomjs/phantomjs /usr/bin/phantomjs && \ + echo "Phantom JS version:" && \ + phantomjs --version && \ + cd -; \ + fi && \ + # Install ytdl-sub, ensure it is installed properly pip install --no-cache-dir ytdl_sub-*.whl && \ - ytdl-sub -h && \ + ytdl-sub -h && \ # Delete unneeded packages after install rm ytdl_sub-*.whl && \ apk del \ diff --git a/tests/e2e/plugins/test_chapters.py b/tests/e2e/plugins/test_chapters.py index 69d5fe29..813ff1f2 100644 --- a/tests/e2e/plugins/test_chapters.py +++ b/tests/e2e/plugins/test_chapters.py @@ -111,4 +111,5 @@ class TestChapters: output_directory=output_directory, dry_run=dry_run, expected_download_summary_file_name="plugins/chapters/test_chapters_from_comments.json", + ignore_md5_hashes_for=["JMC/JMC - Move 78 - Automated Improvisation [Full Album].mp4"], )