Merge pull request #8 from linuxserver-labs/3.17

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,24 +15,24 @@ RUN \
     gcc \
     musl-dev \
     python3-dev \
-    py3-wheel \
     libffi-dev \
     openssl-dev \
     cargo && \
   apk add -U --upgrade --no-cache  \
-    bash \
-    curl \
     python3 \
     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 +45,4 @@ COPY root/ /
 
 EXPOSE 2812
 
-VOLUME /config
+VOLUME /config

README.md

@@ -36,9 +36,7 @@ Find us at:
 [![GitHub Release](https://img.shields.io/github/release/linuxserver-labs/docker-monit.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver-labs/docker-monit/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver-labs/docker-monit/packages)
 
-[monit](https://www.monit.com/products/open-source-log-management/) is a small Open Source utility for managing and monitoring Unix systems.
-
-[![monit](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/monit-logo.png)](https://www.monit.com/products/open-source-log-management/)
+[monit](https://mmonit.com/monit/#about) is a small Open Source utility for managing and monitoring Unix systems.
 
 ## Supported Architectures
 
@@ -62,7 +60,7 @@ Edit `/config/monitrc` to add services to monitor. Use `then exec "/config/monit
 
 Edit `/config/monit2apprise.sh` to customise the alert message.
 
-More info at [monit](https://mmonit.com/monit/).
+More info at [monit](https://mmonit.com/monit/#documentation).
 
 ## Usage
 
@@ -226,5 +224,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.