danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[DOCKER] Upgrade ffmpeg, add phantomjs (#448)

Browse source 
* [DOCKER] Upgrade ffmpeg, add phantomjs

* only install phantomjs for x86

* lint
This commit is contained in:
Jesse Bannon 2023-02-20 09:36:41 -08:00 committed by GitHub
parent 69df95e0e9
commit f713d720e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
docker/Dockerfile
View file

@ -1,26 +1,37 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.16 FROM ghcr.io/linuxserver/baseimage-alpine:3.17
############################################################################### ###############################################################################
# YTDL-SUB INSTALL # YTDL-SUB INSTALL
COPY root/ / COPY root/ /
RUN apk update --no-cache && \ RUN mkdir -p /config && \
apk update --no-cache && \
apk upgrade --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 \ vim \
g++ \ g++ \
nano \ nano \
make \ make \
ffmpeg \
python3=~3.10 \ python3=~3.10 \
py3-pip \ py3-pip \
fontconfig \
py3-setuptools && \ py3-setuptools && \
mkdir -p /config && \ # Install edge ffmpeg, ensure it is properly installed
# Ensure ffmpeg is installed property apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
ffmpeg -version && \ ffmpeg=5.1.2-r8 && \
# Install ytdl-sub, ensure it is installed propertly 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 && \ pip install --no-cache-dir ytdl_sub-*.whl && \
ytdl-sub -h && \ ytdl-sub -h && \
# Delete unneeded packages after install # Delete unneeded packages after install
rm ytdl_sub-*.whl && \ rm ytdl_sub-*.whl && \
apk del \ apk del \

1
tests/e2e/plugins/test_chapters.py
View file

@ -111,4 +111,5 @@ class TestChapters:
output_directory=output_directory, output_directory=output_directory,
dry_run=dry_run, dry_run=dry_run,
expected_download_summary_file_name="plugins/chapters/test_chapters_from_comments.json", 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"],
) )