Merge pull request #11 from linuxserver/3.17-develop

Author: thespad

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,7 +20,6 @@ RUN \
     build-base \
     gcc \
     g++ \
-    jq \
     libffi-dev \
     libxml2-dev \
     libzen-dev \
@@ -41,15 +42,13 @@ RUN \
     /tmp/pmm.tar.gz -C \
     /app/pmm --strip-components=1 && \
   cd /app/pmm && \
-  python3 -m pip install --upgrade pip && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
+  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.16/ -r requirements.txt && \
   pip3 cache purge && \
   echo "**** cleanup ****" && \
-  ln -s \
-    /usr/bin/python3 \
-    /usr/bin/python && \
   apk del --purge \
     build-dependencies && \
   rm -rf \

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,7 +20,6 @@ RUN \
     build-base \
     gcc \
     g++ \
-    jq \
     libffi-dev \
     libxml2-dev \
     libzen-dev \
@@ -41,15 +42,13 @@ RUN \
     /tmp/pmm.tar.gz -C \
     /app/pmm --strip-components=1 && \
   cd /app/pmm && \
-  python3 -m pip install --upgrade pip && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
+  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.16/ -r requirements.txt && \
   pip3 cache purge && \
   echo "**** cleanup ****" && \
-  ln -s \
-    /usr/bin/python3 \
-    /usr/bin/python && \
   apk del --purge \
     build-dependencies && \
   rm -rf \

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -18,7 +20,6 @@ RUN \
     build-base \
     gcc \
     g++ \
-    jq \
     libffi-dev \
     libxml2-dev \
     libzen-dev \
@@ -41,15 +42,13 @@ RUN \
     /tmp/pmm.tar.gz -C \
     /app/pmm --strip-components=1 && \
   cd /app/pmm && \
-  python3 -m pip install --upgrade pip && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.16/ \
+  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.16/ -r requirements.txt && \
   pip3 cache purge && \
   echo "**** cleanup ****" && \
-  ln -s \
-    /usr/bin/python3 \
-    /usr/bin/python && \
   apk del --purge \
     build-dependencies && \
   rm -rf \

README.md

@@ -247,6 +247,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **11.12.22:** - Rebase develop to Alpine 3.17.
 * **08.11.22:** - Add develop branch.
 * **25.10.22:** - Support commandline args and relative paths.
 * **03.10.22:** - Rebase to Alpine 3.16, migrate to s6v3.

readme-vars.yml

@@ -61,6 +61,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "11.12.22:", desc: "Rebase develop to Alpine 3.17." }
   - { date: "08.11.22:", desc: "Add develop branch." }
   - { date: "25.10.22:", desc: "Support commandline args and relative paths." }
   - { date: "03.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }

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

@@ -2,6 +2,8 @@
 
 IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
 
+export PMM_LINUXSERVER=True
+
 cd / || exit 1
 
 # halt startup if no config file is found

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

@@ -2,6 +2,8 @@
 
 IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
 
+export PMM_LINUXSERVER=True
+
 cd / || exit 1
 
 # halt startup if no config file is found