[DOCKER] Use alpine-3.16, update ffmpeg (attempt 2) (#332)

* Revert "Revert "[DOCKER] Use alpine-3.16, update ffmpeg (#330)" (#331)"

This reverts commit 1fa3aa5967.

* update mediafile

* lots of changes

* remove setup py

.github/workflows/package.yaml

@@ -38,12 +38,7 @@ jobs:
 
       - name: Build Wheel
         run: |
-          # Build wheel and copy to docker dir
+          make docker_stage
-          pip install -e .[build]
-          python setup.py bdist_wheel
-          cp dist/*.whl docker/root
-          # Copy examples to docker defaults dir
-          cp -R examples docker/root/defaults/
 
       - name: Save Python build cache
         uses: actions/cache@v3

.gitignore

@@ -141,3 +141,4 @@ dmypy.json
 
 docker/*.whl
 docker/root/*.whl
+docker/root/defaults/examples

Makefile

@@ -1,8 +1,11 @@
 
 wheel: clean
-	python setup.py bdist_wheel
+	pip3 install build
-docker: wheel
+	python3 -m build
+docker_stage: wheel
 	cp dist/*.whl docker/root/
+	cp -R examples docker/root/defaults/
+docker: docker_stage
 	sudo docker build --no-cache -t ytdl-sub:0.1 docker/
 docs:
 	sphinx-build -a -b html docs docs/_html
@@ -14,6 +17,8 @@ clean:
 		src/ytdl_sub.egg-info/ \
 		docs/_html/ \
 		.coverage \
+		docker/root/*.whl \
+		docker/root/defaults/examples \
 		coverage.xml
 
 .PHONY: wheel docker docs clean

docker/Dockerfile

@@ -1,23 +1,19 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 ###############################################################################
 # YTDL-SUB INSTALL
 
 COPY root/ /
 RUN apk update --no-cache && \
-    apk add \
+    apk add --repository=http://dl-3.alpinelinux.org/alpine/edge/main/ \
       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 && \

setup.cfg

@@ -27,7 +27,7 @@ install_requires =
     yt-dlp
     argparse==1.4.0
     mergedeep==1.3.4
-    mediafile==0.9.0
+    mediafile==0.10.1
     PyYAML==6.0
 
 [options.package_data]
@@ -49,6 +49,5 @@ docs =
     sphinx==4.5.0
     sphinx-rtd-theme==1.0.0
 build =
-    setuptools
+    build
-    wheel
 

setup.py

@@ -1,4 +0,0 @@
-from setuptools import setup
-
-if __name__ == "__main__":
-    setup()

tools/docs

@@ -1,4 +0,0 @@
-# Uncomment to build api docs
-# sphinx-apidoc -f -o docs/source src/ytdl_sub
-sphinx-build -a -b html docs docs/_html
-