Rebase to 3.17, migrate to s6v3

Author: thespad

.github/workflows/call-baseimage-update.yml

@@ -12,6 +12,6 @@ jobs:
       repo_owner: ${{ github.repository_owner }}
       app_name: "monit"
       baseimage: "alpine"
-      basebranch: "3.15"
+      basebranch: "3.17"
     secrets:
       repo_release_token: ${{ secrets.repo_release_token }}

.github/workflows/call-build-image.yml

@@ -12,7 +12,7 @@ jobs:
       repo_owner: ${{ github.repository_owner }}
       app_name: "monit"
       release_type: "alpine"
-      release_url: "v3.15/main"
+      release_url: "v3.17/main"
       release_name: "monit"
       target-arch: "all"
     secrets:

.github/workflows/call-check-and-release.yml

@@ -12,7 +12,7 @@ jobs:
       repo_owner: ${{ github.repository_owner }}
       app_name: "monit"
       release_type: "alpine"
-      release_url: "v3.15/main"
+      release_url: "v3.17/main"
       release_name: "monit"
     secrets:
       repo_release_token: ${{ secrets.repo_release_token }}

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
@@ -13,7 +15,6 @@ RUN \
     gcc \
     musl-dev \
     python3-dev \
-    py3-wheel \
     libffi-dev \
     openssl-dev \
     cargo && \
@@ -24,13 +25,16 @@ RUN \
     py3-pip && \
   echo "**** install monit ****" && \
   if [ -z ${APP_VERSION+x} ]; then \    
-    APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.15/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    APP_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:'"monit"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \    
   apk add -U --upgrade --no-cache \
     monit==${APP_VERSION} && \
-  python3 -m pip install --upgrade pip && \
-  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ \
+  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/ \
     apprise && \
   apk del --purge \
     build-dependencies && \
@@ -43,4 +47,4 @@ COPY root/ /
 
 EXPOSE 2812
 
-VOLUME /config
+VOLUME /config

README.md

@@ -226,5 +226,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **12.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
 * **10.01.22:** - Rebase to Alpine 3.15.
 * **20.10.21:** - Initial release.

root/etc/cont-init.d/50-config

@@ -0,0 +1,21 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+#Copy defaults
+if [[ ! -f "/config/monitrc" ]]; then
+    cp -a /defaults/monitrc /config/monitrc
+fi
+
+if [[ ! -f "/config/monit2apprise.sh" ]]; then
+    cp -a /defaults/monit2apprise.sh /config/monit2apprise.sh
+fi
+
+# set permissions
+chmod 700 \
+    /config/monitrc
+
+chmod +x \
+    /config/monit2apprise.sh
+
+lsiown -R abc:abc \
+    /config

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

@@ -0,0 +1 @@
+oneshot