Skip to content
This repository was archived by the owner on Apr 23, 2024. It is now read-only.

Commit fdc8b20

Browse files
committed
Rebase to 3.17, add PMM_LINUXSERVER
1 parent 83221ce commit fdc8b20

File tree

6 files changed

+23
-21
lines changed

6 files changed

+23
-21
lines changed

Dockerfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.16
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
22

33
# set version label
44
ARG BUILD_DATE
@@ -18,7 +18,6 @@ RUN \
1818
build-base \
1919
gcc \
2020
g++ \
21-
jq \
2221
libffi-dev \
2322
libxml2-dev \
2423
libzen-dev \
@@ -27,8 +26,7 @@ RUN \
2726
grep \
2827
libjpeg \
2928
libxslt \
30-
python3 \
31-
py3-pip && \
29+
python3 && \
3230
if [ -z ${PMM_VERSION+x} ]; then \
3331
PMM_VERSION=$(curl -s https://api.github.com/repos/meisnate12/Plex-Meta-Manager/releases \
3432
| jq -r 'first(.[]) | .tag_name'); \
@@ -41,10 +39,11 @@ RUN \
4139
/tmp/pmm.tar.gz -C \
4240
/app/pmm --strip-components=1 && \
4341
cd /app/pmm && \
44-
python3 -m pip install --upgrade pip && \
45-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
42+
python3 -m ensurepip && \
43+
pip3 install -U --no-cache-dir \
44+
pip \
4645
wheel && \
47-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \
46+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \
4847
pip3 cache purge && \
4948
echo "**** cleanup ****" && \
5049
ln -s \

Dockerfile.aarch64

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
22

33
# set version label
44
ARG BUILD_DATE
@@ -18,7 +18,6 @@ RUN \
1818
build-base \
1919
gcc \
2020
g++ \
21-
jq \
2221
libffi-dev \
2322
libxml2-dev \
2423
libzen-dev \
@@ -27,8 +26,7 @@ RUN \
2726
grep \
2827
libjpeg \
2928
libxslt \
30-
python3 \
31-
py3-pip && \
29+
python3 && \
3230
if [ -z ${PMM_VERSION+x} ]; then \
3331
PMM_VERSION=$(curl -s https://api.github.com/repos/meisnate12/Plex-Meta-Manager/releases \
3432
| jq -r 'first(.[]) | .tag_name'); \
@@ -41,10 +39,11 @@ RUN \
4139
/tmp/pmm.tar.gz -C \
4240
/app/pmm --strip-components=1 && \
4341
cd /app/pmm && \
44-
python3 -m pip install --upgrade pip && \
45-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
42+
python3 -m ensurepip && \
43+
pip3 install -U --no-cache-dir \
44+
pip \
4645
wheel && \
47-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \
46+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \
4847
pip3 cache purge && \
4948
echo "**** cleanup ****" && \
5049
ln -s \

Dockerfile.armhf

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
22

33
# set version label
44
ARG BUILD_DATE
@@ -18,7 +18,6 @@ RUN \
1818
build-base \
1919
gcc \
2020
g++ \
21-
jq \
2221
libffi-dev \
2322
libxml2-dev \
2423
libzen-dev \
@@ -27,8 +26,7 @@ RUN \
2726
grep \
2827
libjpeg \
2928
libxslt \
30-
python3 \
31-
py3-pip && \
29+
python3 && \
3230
if [ -z ${PMM_VERSION+x} ]; then \
3331
PMM_VERSION=$(curl -s https://api.github.com/repos/meisnate12/Plex-Meta-Manager/releases \
3432
| jq -r 'first(.[]) | .tag_name'); \
@@ -41,10 +39,11 @@ RUN \
4139
/tmp/pmm.tar.gz -C \
4240
/app/pmm --strip-components=1 && \
4341
cd /app/pmm && \
44-
python3 -m pip install --upgrade pip && \
45-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
42+
python3 -m ensurepip && \
43+
pip3 install -U --no-cache-dir \
44+
pip \
4645
wheel && \
47-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ -r requirements.txt && \
46+
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \
4847
pip3 cache purge && \
4948
echo "**** cleanup ****" && \
5049
ln -s \

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ app_setup_block: |
6161
6262
# changelog
6363
changelogs:
64+
- { date: "11.12.22:", desc: "Rebase master to Alpine 3.17." }
6465
- { date: "08.11.22:", desc: "Add develop branch." }
6566
- { date: "25.10.22:", desc: "Support commandline args and relative paths." }
6667
- { date: "03.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }

root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
44

5+
export PMM_LINUXSERVER=True
6+
57
cd / || exit 1
68

79
# halt startup if no config file is found

root/etc/s6-overlay/s6-rc.d/svc-pmm/run

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
44

5+
export PMM_LINUXSERVER=True
6+
57
cd / || exit 1
68

79
# halt startup if no config file is found

0 commit comments

Comments
 (0)