Skip to content

Commit 16b7615

Browse files
nemchiknemchik
authored
Merge pull request #20 from linuxserver/3.17-master
Rebase master to alpine 3.17
2 parents 4312144 + 92e4bad commit 16b7615

File tree

16 files changed

+55
-43
lines changed

16 files changed

+55
-43
lines changed

‎Dockerfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
24

35
# set version label
46
ARG BUILD_DATE
@@ -26,19 +28,19 @@ RUN \
2628
ffmpeg \
2729
libjpeg-turbo \
2830
p7zip \
29-
py3-pip \
3031
python3 \
3132
sqlite \
3233
tesseract-ocr && \
3334
echo "**** install pyload ****" && \
3435
if [ -z ${PYLOAD_VERSION+x} ]; then \
35-
PYLOAD="pyload-ng[all]"; \
36-
else \
37-
PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
36+
PYLOAD_VERSION=$(curl -sL https://pypi.python.org/pypi/pyload-ng/json |jq -r '. | .info.version'); \
3837
fi && \
39-
pip3 install -U pip setuptools wheel && \
40-
pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
41-
"${PYLOAD}" && \
38+
python3 -m ensurepip && \
39+
pip3 install -U --no-cache-dir \
40+
pip \
41+
wheel && \
42+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
43+
pyload-ng[all]=="${PYLOAD_VERSION}" && \
4244
echo "**** cleanup ****" && \
4345
apk del --purge \
4446
build-dependencies && \

‎Dockerfile.aarch64

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
24

35
# set version label
46
ARG BUILD_DATE
@@ -26,19 +28,19 @@ RUN \
2628
ffmpeg \
2729
libjpeg-turbo \
2830
p7zip \
29-
py3-pip \
3031
python3 \
3132
sqlite \
3233
tesseract-ocr && \
3334
echo "**** install pyload ****" && \
3435
if [ -z ${PYLOAD_VERSION+x} ]; then \
35-
PYLOAD="pyload-ng[all]"; \
36-
else \
37-
PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
36+
PYLOAD_VERSION=$(curl -sL https://pypi.python.org/pypi/pyload-ng/json |jq -r '. | .info.version'); \
3837
fi && \
39-
pip3 install -U pip setuptools wheel && \
40-
pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
41-
"${PYLOAD}" && \
38+
python3 -m ensurepip && \
39+
pip3 install -U --no-cache-dir \
40+
pip \
41+
wheel && \
42+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
43+
pyload-ng[all]=="${PYLOAD_VERSION}" && \
4244
echo "**** cleanup ****" && \
4345
apk del --purge \
4446
build-dependencies && \

‎Dockerfile.armhf

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
24

35
# set version label
46
ARG BUILD_DATE
@@ -26,19 +28,19 @@ RUN \
2628
ffmpeg \
2729
libjpeg-turbo \
2830
p7zip \
29-
py3-pip \
3031
python3 \
3132
sqlite \
3233
tesseract-ocr && \
3334
echo "**** install pyload ****" && \
3435
if [ -z ${PYLOAD_VERSION+x} ]; then \
35-
PYLOAD="pyload-ng[all]"; \
36-
else \
37-
PYLOAD="pyload-ng[all]==${PYLOAD_VERSION}"; \
36+
PYLOAD_VERSION=$(curl -sL https://pypi.python.org/pypi/pyload-ng/json |jq -r '. | .info.version'); \
3837
fi && \
39-
pip3 install -U pip setuptools wheel && \
40-
pip install -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
41-
"${PYLOAD}" && \
38+
python3 -m ensurepip && \
39+
pip3 install -U --no-cache-dir \
40+
pip \
41+
wheel && \
42+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
43+
pyload-ng[all]=="${PYLOAD_VERSION}" && \
4244
echo "**** cleanup ****" && \
4345
apk del --purge \
4446
build-dependencies && \

‎readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ app_setup_block: |
5050
5151
# changelog
5252
changelogs:
53+
- { date: "02.02.22:", desc: "Rebase master to alpine 3.17." }
5354
- { date: "02.02.22:", desc: "Add ffmpeg for the Youtube plugin." }
5455
- { date: "24.01.22:", desc: "Replace unrar with p7zip." }
5556
- { date: "24.01.22:", desc: "Initial release." }

‎root/etc/cont-init.d/30-config

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-pyload-config

Whitespace-only changes.

‎root/etc/s6-overlay/s6-rc.d/init-pyload-config/dependencies.d/init-config

Whitespace-only changes.

‎root/etc/s6-overlay/s6-rc.d/init-pyload-config/run

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/with-contenv bash
2+
# shellcheck shell=bash
3+
4+
# create our folders
5+
mkdir -p \
6+
/config/settings \
7+
/downloads
8+
9+
# default config file
10+
cp -n \
11+
/defaults/pyload.cfg \
12+
/config/settings/pyload.cfg
13+
14+
# permissions
15+
lsiown -R abc:abc \
16+
/config
17+
lsiown abc:abc \
18+
/downloads

‎root/etc/s6-overlay/s6-rc.d/init-pyload-config/type

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oneshot

‎root/etc/s6-overlay/s6-rc.d/init-pyload-config/up

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/etc/s6-overlay/s6-rc.d/init-pyload-config/run

0 commit comments

Comments
 (0)