From 1fa3aa596704be3b4d65549254dc07bbfad66031 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Tue, 15 Nov 2022 11:29:49 -0800 Subject: [PATCH] Revert "[DOCKER] Use alpine-3.16, update ffmpeg (#330)" (#331) This reverts commit 7b43aa904b5df32e6438b312f5d72673179d5ae5. --- docker/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c5151dfc..c5b83022 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,19 +1,23 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.16 +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 ############################################################################### # YTDL-SUB INSTALL COPY root/ / RUN apk update --no-cache && \ - apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/main/ \ + apk add \ vim \ g++ \ nano \ make \ + ffmpeg && \ + apk del \ + python3 \ + py3-pip && \ + apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/main/ \ python3=~3.10 \ py3-setuptools && \ apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/community/ \ - ffmpeg \ py3-pip && \ mkdir -p /config && \ pip install --no-cache-dir ytdl_sub-*.whl && \ @@ -21,8 +25,7 @@ RUN apk update --no-cache && \ apk del \ g++ \ make \ - py3-setuptools \ - py3-pip + py3-setuptools ############################################################################### # CONTAINER CONFIGS