mirror of
https://github.com/linuxserver/docker-pyload-ng.git
synced 2026-02-04 20:19:04 +08:00
Rebase master to alpine 3.17
This commit is contained in:
parent
4312144c63
commit
96d358d81f
18
Dockerfile
18
Dockerfile
@ -1,4 +1,6 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -26,19 +28,19 @@ RUN \
|
||||
ffmpeg \
|
||||
libjpeg-turbo \
|
||||
p7zip \
|
||||
py3-pip \
|
||||
python3 \
|
||||
sqlite \
|
||||
tesseract-ocr && \
|
||||
echo "**** install pyload ****" && \
|
||||
if [ -z ${PYLOAD_VERSION+x} ]; then \
|
||||
PYLOAD="pyload-ng[all]"; \
|
||||
else \
|
||||
PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
|
||||
PYLOAD_VERSION=$(curl -sL https://pypi.python.org/pypi/pyload-ng/json |jq -r '. | .info.version'); \
|
||||
fi && \
|
||||
pip3 install -U pip setuptools wheel && \
|
||||
pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
|
||||
"${PYLOAD}" && \
|
||||
python3 -m ensurepip && \
|
||||
pip3 install -U --no-cache-dir \
|
||||
pip \
|
||||
wheel && \
|
||||
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
|
||||
pyload-ng[all]=="${PYLOAD_VERSION}" && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -26,19 +28,19 @@ RUN \
|
||||
ffmpeg \
|
||||
libjpeg-turbo \
|
||||
p7zip \
|
||||
py3-pip \
|
||||
python3 \
|
||||
sqlite \
|
||||
tesseract-ocr && \
|
||||
echo "**** install pyload ****" && \
|
||||
if [ -z ${PYLOAD_VERSION+x} ]; then \
|
||||
PYLOAD="pyload-ng[all]"; \
|
||||
else \
|
||||
PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
|
||||
PYLOAD_VERSION=$(curl -sL https://pypi.python.org/pypi/pyload-ng/json |jq -r '. | .info.version'); \
|
||||
fi && \
|
||||
pip3 install -U pip setuptools wheel && \
|
||||
pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
|
||||
"${PYLOAD}" && \
|
||||
python3 -m ensurepip && \
|
||||
pip3 install -U --no-cache-dir \
|
||||
pip \
|
||||
wheel && \
|
||||
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
|
||||
pyload-ng[all]=="${PYLOAD_VERSION}" && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@ -26,19 +28,19 @@ RUN \
|
||||
ffmpeg \
|
||||
libjpeg-turbo \
|
||||
p7zip \
|
||||
py3-pip \
|
||||
python3 \
|
||||
sqlite \
|
||||
tesseract-ocr && \
|
||||
echo "**** install pyload ****" && \
|
||||
if [ -z ${PYLOAD_VERSION+x} ]; then \
|
||||
PYLOAD="pyload-ng[all]"; \
|
||||
else \
|
||||
PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
|
||||
PYLOAD_VERSION=$(curl -sL https://pypi.python.org/pypi/pyload-ng/json |jq -r '. | .info.version'); \
|
||||
fi && \
|
||||
pip3 install -U pip setuptools wheel && \
|
||||
pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
|
||||
"${PYLOAD}" && \
|
||||
python3 -m ensurepip && \
|
||||
pip3 install -U --no-cache-dir \
|
||||
pip \
|
||||
wheel && \
|
||||
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
|
||||
pyload-ng[all]=="${PYLOAD_VERSION}" && \
|
||||
echo "**** cleanup ****" && \
|
||||
apk del --purge \
|
||||
build-dependencies && \
|
||||
|
||||
@ -50,6 +50,7 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "02.02.22:", desc: "Rebase master to alpine 3.17." }
|
||||
- { date: "02.02.22:", desc: "Add ffmpeg for the Youtube plugin." }
|
||||
- { date: "24.01.22:", desc: "Replace unrar with p7zip." }
|
||||
- { date: "24.01.22:", desc: "Initial release." }
|
||||
|
||||
12
root/etc/cont-init.d/30-config → root/etc/s6-overlay/s6-rc.d/init-pyload-config/run
Normal file → Executable file
12
root/etc/cont-init.d/30-config → root/etc/s6-overlay/s6-rc.d/init-pyload-config/run
Normal file → Executable file
@ -1,4 +1,5 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
|
||||
# create our folders
|
||||
mkdir -p \
|
||||
@ -6,14 +7,13 @@ mkdir -p \
|
||||
/downloads
|
||||
|
||||
# default config file
|
||||
[[ ! -f "/config/settings/pyload.cfg" ]] && \
|
||||
cp \
|
||||
/defaults/pyload.cfg \
|
||||
/config/settings/pyload.cfg
|
||||
cp -n \
|
||||
/defaults/pyload.cfg \
|
||||
/config/settings/pyload.cfg
|
||||
|
||||
# permissions
|
||||
echo "[cont-init.d] Setting permissions this may take some time"
|
||||
chown -R abc:abc \
|
||||
lsiown -R abc:abc \
|
||||
/config
|
||||
chown abc:abc \
|
||||
lsiown abc:abc \
|
||||
/downloads
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-pyload-config/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-pyload-config/type
Normal file
@ -0,0 +1 @@
|
||||
oneshot
|
||||
1
root/etc/s6-overlay/s6-rc.d/init-pyload-config/up
Normal file
1
root/etc/s6-overlay/s6-rc.d/init-pyload-config/up
Normal file
@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-pyload-config/run
|
||||
1
root/etc/s6-overlay/s6-rc.d/svc-pyload/notification-fd
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-pyload/notification-fd
Normal file
@ -0,0 +1 @@
|
||||
3
|
||||
2
root/etc/services.d/pyload/run → root/etc/s6-overlay/s6-rc.d/svc-pyload/run
Normal file → Executable file
2
root/etc/services.d/pyload/run → root/etc/s6-overlay/s6-rc.d/svc-pyload/run
Normal file → Executable file
@ -1,4 +1,6 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
|
||||
exec \
|
||||
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8000" \
|
||||
s6-setuidgid abc pyload --userdir /config --storagedir /downloads
|
||||
1
root/etc/s6-overlay/s6-rc.d/svc-pyload/type
Normal file
1
root/etc/s6-overlay/s6-rc.d/svc-pyload/type
Normal file
@ -0,0 +1 @@
|
||||
longrun
|
||||
Loading…
x
Reference in New Issue
Block a user