Merge pull request #19 from thespad/3.20

Rebase to 3.20
thespad · May 26, 2024 · 8e201fb · 8e201fb
2 parents e5f67e9 + 3b5e870
commit 8e201fb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -11,6 +11,7 @@ LABEL maintainer="thespad"
 LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr"
 LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr"
 LABEL org.opencontainers.image.description="An adult movie collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new movies and will interface with clients and indexers to grab, sort, and rename them."
+LABEL org.opencontainers.image.authors="thespad"
 
 # environment settings
 ARG APP_BRANCH="nightly"
@@ -34,6 +35,7 @@ RUN \
   /tmp/whisparr.tar.gz -C \
     /app/whisparr/bin --strip-components=1 && \
   echo -e "UpdateMethod=docker\nBranch=${APP_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[thespad](https://github.com/thespad)" > /app/whisparr/package_info && \
+  printf "Version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/whisparr/bin/Whisparr.Update \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -11,6 +11,7 @@ LABEL maintainer="thespad"
 LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr"
 LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr"
 LABEL org.opencontainers.image.description="An adult movie collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new movies and will interface with clients and indexers to grab, sort, and rename them."
+LABEL org.opencontainers.image.authors="thespad"
 
 # environment settings
 ARG APP_BRANCH="nightly"
@@ -34,6 +35,7 @@ RUN \
   /tmp/whisparr.tar.gz -C \
     /app/whisparr/bin --strip-components=1 && \
   echo -e "UpdateMethod=docker\nBranch=${APP_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[thespad](https://github.com/thespad)" > /app/whisparr/package_info && \
+  printf "Version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/whisparr/bin/Whisparr.Update \

diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@
 [![GitHub Stars](https://img.shields.io/github/stars/thespad/docker-whisparr.svg?color=26689A&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/thespad/docker-whisparr)
 [![Docker Stars](https://img.shields.io/docker/stars/thespad/whisparr.svg?color=26689A&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/thespad/whisparr)
 
-[![ci](https://img.shields.io/github/actions/workflow/status/thespad/docker-whisparr/call-check-and-release.yml?branch=nightly&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Upstream%20Updates)](https://github.com/thespad/docker-whisparr/actions/workflows/call-check-and-release.yml)
-[![ci](https://img.shields.io/github/actions/workflow/status/thespad/docker-whisparr/call-baseimage-update.yml?branch=nightly&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Baseimage%20Updates)](https://github.com/thespad/docker-whisparr/actions/workflows/call-baseimage-update.yml)
-[![ci](https://img.shields.io/github/actions/workflow/status/thespad/docker-whisparr/call-build-image.yml?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Build%20Image)](https://github.com/thespad/docker-whisparr/actions/workflows/call-build-image.yml)
+[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/thespad/docker-whisparr/call-check-and-release.yml?branch=nightly&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Upstream%20Updates)](https://github.com/thespad/docker-whisparr/actions/workflows/call-check-and-release.yml)
+[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/thespad/docker-whisparr/call-baseimage-update.yml?branch=nightly&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Check%20For%20Baseimage%20Updates)](https://github.com/thespad/docker-whisparr/actions/workflows/call-baseimage-update.yml)
+[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/thespad/docker-whisparr/call-build-image.yml?labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github&label=Build%20Image)](https://github.com/thespad/docker-whisparr/actions/workflows/call-build-image.yml)
 
 [whisparr](https://github.com/whisparr/whisparr) is an adult movie collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new movies and will interface with clients and indexers to grab, sort, and rename them. It can also be configured to automatically upgrade the quality of existing files in the library when a better quality format becomes available.
 
@@ -38,7 +38,6 @@ Compatible with docker-compose v2 schemas.
 
 ```yaml
 ---
-version: "2.1"
 services:
   get_iplayer:
     image: ghcr.io/thespad/whisparr:latest
@@ -48,8 +47,8 @@ services:
       - PGID=1000
       - TZ=America/New_York
     volumes:
-      - </path/to/appdata/config>:/config
-      - </path/to/appdata/downloads>:/downloads
+      - /path/to/whisparr/config:/config
+      - /path/to/downloads:/downloads
     ports:
       - 6969:6969
     restart: unless-stopped
@@ -64,8 +63,8 @@ docker run -d \
   -e PGID=1000 \
   -e TZ=America/New_York \
   -p 6969:6969 \
-  -v </path/to/appdata/config>:/config \
-  -v </path/to/appdata/downloads>:/downloads \
+  -v /path/to/whisparr/config:/config \
+  -v /path/to/downloads:/downloads \
   --restart unless-stopped \
   ghcr.io/thespad/whisparr:latest
 ```
@@ -89,6 +88,7 @@ Container images are configured using parameters passed at runtime (such as thos
 
 ## Versions
 
+* **26.05.24:** - Rebase to Alpine 3.20.
 * **30.12.23:** - Rebase to Alpine 3.19.
 * **14.05.23:** - Rebase to Alpine 3.18. Drop support for armhf.
 * **09.12.22:** - Rebase to 3.17.

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/data/check b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/data/check
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-if [[ $(curl -sL "http://localhost:6969/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
+if [[ -f /config/config.xml ]]; then
+    PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
+fi
+
+if [[ $(curl -sL "http://localhost:${PORT:-6969}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
     exit 0
 else
     exit 1