From 26ddc8ac66f30f114f7f9df43f0fb6521ab246a5 Mon Sep 17 00:00:00 2001 From: Viktor Varland Date: Mon, 14 Apr 2025 09:33:49 +0200 Subject: [PATCH] feat: fix the container --- Containerfile | 57 ++++++++++++++++++++++++++++++++------------------- README.md | 6 +----- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/Containerfile b/Containerfile index b214ab1..42eb63b 100644 --- a/Containerfile +++ b/Containerfile @@ -8,22 +8,26 @@ RUN go mod download COPY . . RUN go build -o /src/build/subsyt . -FROM docker.io/library/archlinux:latest +FROM docker.io/library/alpine:3.21 -RUN pacman -Syu --noconfirm \ - yt-dlp \ +RUN apk update && apk upgrade && apk add --no-cache \ + bash \ ffmpeg \ - rtmpdump \ - atomicparsley \ aria2 \ - python-mutagen \ - python-pycryptodome \ - python-pycryptodomex \ - python-websockets \ - python-brotli \ - python-brotlicffi \ - python-xattr \ - python-pyxattr + pipx \ + attr \ + mutagen \ + ca-certificates \ + python3 \ + py3-requests \ + py3-certifi \ + py3-brotli \ + py3-mutagen \ + py3-pycryptodomex \ + py3-secretstorage \ + py3-websockets + +RUN mkdir -p /data/vids COPY <<-EOT /data/config.toml dry_run = false @@ -31,16 +35,27 @@ COPY <<-EOT /data/config.toml [provider] [provider.youtube] - cmd = "yt-dlp" - url = "https://www.youtube.com" - throttle = 1 - range = "1:5:1" - after_date = "20250326" - cookies = "/data/cookies.txt" + cmd = "/root/.local/bin/yt-dlp" opml_file = "/data/opml.xml" + url = "https://www.youtube.com" + quality = "res:1080" + output_path_template = "s%(upload_date>%Y)s/%(channel)s.s%(upload_date>%Y)Se%(upload_date>%m%d)S.%(title)s.%(id)s-1080p.%(ext)s" + throttle = 5 + range = "1:5:1" + after_date = "" + cookies_file = "" + po_token = "" EOT +WORKDIR /app + +RUN pipx ensurepath +RUN pipx install yt-dlp +RUN pipx inject yt-dlp yt-dlp-get-pot +RUN pipx inject yt-dlp bgutil-ytdlp-pot-provider + +RUN source /root/.bashrc + COPY --from=builder /src/build/subsyt /app/subsyt -WORKDIR /app -ENTRYPOINT [ "/app/subsyt" ] +CMD [ "/app/subsyt", "--config=/data/config.toml" ] diff --git a/README.md b/README.md index e176fa1..c88a68a 100644 --- a/README.md +++ b/README.md @@ -214,15 +214,11 @@ WantedBy=timers.target ## container -> [!CAUTION] -> The image is currently broken - ``` podman run --rm \ - --env='CONFIG=/data/config.toml' \ --volume=path/to/config:/data/config.toml \ --volume=path/to/opml:/data/opml.xml \ - --volume=path/to/cookies:/data/cookies.txt + --volume=path/to/vids:/data/vids \ registry.meatbag.se/varl/subsyt ```