From 5b8d5c74cf31fbc17e3a5109ac9bd312c23bbf99 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Mon, 20 Feb 2023 09:19:47 -0800 Subject: [PATCH] only install phantomjs for x86 --- docker/Dockerfile | 9 ++++++--- tests/e2e/plugins/test_chapters.py | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1e925456..56d8f2c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,12 +20,15 @@ RUN mkdir -p /config && \ apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ ffmpeg=5.1.2-r8 && \ ffmpeg -version && \ - # Install phantomjs, ensure it is properly installed - cd /usr/share && \ + # 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 - && \ + cd -; \ + fi && \ # Install ytdl-sub, ensure it is installed properly pip install --no-cache-dir ytdl_sub-*.whl && \ ytdl-sub -h && \ diff --git a/tests/e2e/plugins/test_chapters.py b/tests/e2e/plugins/test_chapters.py index 69d5fe29..b565f8b1 100644 --- a/tests/e2e/plugins/test_chapters.py +++ b/tests/e2e/plugins/test_chapters.py @@ -111,4 +111,7 @@ 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" + ], )