Update upstream to new fork (master)

.github/FUNDING.yml

@@ -1,3 +1,2 @@
 github: linuxserver
 open_collective: linuxserver
-custom: ["https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EWQADB5AMVRFU",]

.github/workflows/external_trigger.yml

@@ -29,8 +29,8 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`mylar3_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/mylar3/mylar3/commits/python3-dev" | jq -r '. | .sha' | cut -c1-8)
-          echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/MylarComics/mylar3/releases/latest" | jq -r '. | .tag_name')
+          echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^mylar3_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY

Dockerfile

@@ -11,8 +11,6 @@ ARG MYLAR3_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
-ARG DEBIAN_FRONTEND="noninteractive"
-
 RUN \
   echo "**** install build dependencies ****" && \
   apt-get update && \
@@ -32,20 +30,20 @@ RUN \
     zlib1g-dev && \
   echo "**** install mylar3 ****" && \
   if [ -z ${MYLAR3_RELEASE+x} ]; then \
-    MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/python3-dev \
-      | jq -r '.sha' | cut -c1-8); \
+    MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/releases/latest \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   mkdir /app/mylar3 && \
   curl -o \
     /tmp/mylar3.tar.gz -L \
-    "https://github.com/mylar3/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
+    "https://github.com/MylarComics/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
   tar xf /tmp/mylar3.tar.gz -C \
     /app/mylar3/ --strip-components=1 && \
   cd /app/mylar3 && \
   python3 -m venv /lsiopy && \
   pip install -U --no-cache-dir \
     pip \
-    wheel && \
+    setuptools && \
   pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
+FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
 FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
 
@@ -11,8 +11,6 @@ ARG MYLAR3_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
-ARG DEBIAN_FRONTEND="noninteractive"
-
 RUN \
   echo "**** install build dependencies ****" && \
   apt-get update && \
@@ -32,20 +30,20 @@ RUN \
     zlib1g-dev && \
   echo "**** install mylar3 ****" && \
   if [ -z ${MYLAR3_RELEASE+x} ]; then \
-    MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/mylar3/mylar3/commits/python3-dev \
-      | jq -r '.sha' | cut -c1-8); \
+    MYLAR3_RELEASE=$(curl -sX GET https://api.github.com/repos/MylarComics/mylar3/releases/latest \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   mkdir /app/mylar3 && \
   curl -o \
     /tmp/mylar3.tar.gz -L \
-    "https://github.com/mylar3/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
+    "https://github.com/MylarComics/mylar3/archive/${MYLAR3_RELEASE}.tar.gz" && \
   tar xf /tmp/mylar3.tar.gz -C \
     /app/mylar3/ --strip-components=1 && \
   cd /app/mylar3 && \
   python3 -m venv /lsiopy && \
   pip install -U --no-cache-dir \
     pip \
-    wheel && \
+    setuptools && \
   pip install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ -r requirements.txt && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \

README.md

@@ -37,9 +37,9 @@ Find us at:
 [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-mylar3%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-mylar3/job/master/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fmylar3%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/mylar3/latest/index.html)
 
-[Mylar3](https://github.com/mylar3/mylar3) is an automated Comic Book downloader (cbr/cbz) for use with NZB and torrents written in python. It supports SABnzbd, NZBGET, and many torrent clients in addition to DDL.
+[Mylar3](https://github.com/MylarComics/mylar3) is an automated Comic Book downloader (cbr/cbz) for use with NZB and torrents written in python. It supports SABnzbd, NZBGET, and many torrent clients in addition to DDL.
 
-[![mylar3](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mylar-icon.png)](https://github.com/mylar3/mylar3)
+[![mylar3](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mylar-icon.png)](https://github.com/MylarComics/mylar3)
 
 ## Supported Architectures
 
@@ -60,14 +60,13 @@ This image provides various versions that are available via tags. Please read th
 
 | Tag | Available | Description |
 | :----: | :----: |--- |
-| latest | ✅ | Commits to Mylar3 `python3-dev` branch |
-| nightly | ✅ | Commits to Mylar3 `1000papercuts` branch (ubuntu) |
-| unstable | ✅ | Commits to Mylar3 `1000papercuts` branch (alpine) |
+| latest | ✅ | Stable releases |
+| nightly | ✅ | Commits to nightly branch |
 
 ## Application Setup
 
 The web ui for settings etc, is on `http://SERVERIP:8090`
-For more detailed setup options, refer to [Mylar3](https://github.com/mylar3/mylar3).
+For more detailed setup options, refer to [Mylar3](https://github.com/MylarComics/mylar3).
 
 ## Usage
 
@@ -289,6 +288,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.04.26:** - Switch upstream to maintained fork at https://github.com/MylarComics/mylar3. Drop `unstable` tag. Rebase to Alpine 3.23.
 * **19.02.26:** - Rebase `latest` tag based on commits to upstream `python3-dev` branch. `nightly` will build commits to upstream `1000papercuts` branch. `unstable` tag will also build commits to upstream `1000papercuts` branch, but on alpine 3.23 with python 3.12.
 * **05.02.26:** - Release `unstable` tag based on commits to upstream `1000papercuts` branch.
 * **21.11.25:** - Rebase to Ubuntu Jammy.

jenkins-vars.yml

@@ -2,13 +2,13 @@
 
 # jenkins variables
 project_name: docker-mylar3
-external_type: github_commit
+external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: master
 repo_vars:
-  - EXT_GIT_BRANCH = 'python3-dev'
-  - EXT_USER = 'mylar3'
+  - EXT_GIT_BRANCH = 'stable'
+  - EXT_USER = 'MylarComics'
   - EXT_REPO = 'mylar3'
   - BUILD_VERSION_ARG = 'MYLAR3_RELEASE'
   - LS_USER = 'linuxserver'
@@ -24,8 +24,6 @@ repo_vars:
   - CI_PORT='8090'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV='TZ=Etc/UTC'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''
-sponsor_links:
-  - { name: "Mylar3", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EWQADB5AMVRFU" }

readme-vars.yml

@@ -2,7 +2,7 @@
 
 # project information
 project_name: mylar3
-project_url: "https://github.com/mylar3/mylar3"
+project_url: "https://github.com/MylarComics/mylar3"
 project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mylar-icon.png"
 project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is an automated Comic Book downloader (cbr/cbz) for use with NZB and torrents written in python. It supports SABnzbd, NZBGET, and many torrent clients in addition to DDL."
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
@@ -14,9 +14,8 @@ available_architectures:
 # development version
 development_versions: true
 development_versions_items:
-  - {tag: "latest", desc: "Commits to Mylar3 `python3-dev` branch"}
-  - {tag: "nightly", desc: "Commits to Mylar3 `1000papercuts` branch (ubuntu)"}
-  - {tag: "unstable", desc: "Commits to Mylar3 `1000papercuts` branch (alpine)"}
+  - {tag: "latest", desc: "Stable releases"}
+  - {tag: "nightly", desc: "Commits to nightly branch"}
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
@@ -80,6 +79,7 @@ init_diagram: |
   "mylar3:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "06.04.26:", desc: "Switch upstream to maintained fork at https://github.com/MylarComics/mylar3. Drop `unstable` tag."}
   - {date: "19.02.26:", desc: "Rebase `latest` tag based on commits to upstream `python3-dev` branch. `nightly` will build commits to upstream `1000papercuts` branch. `unstable` tag will also build commits to upstream `1000papercuts` branch, but on alpine 3.23 with python 3.12."}
   - {date: "05.02.26:", desc: "Release `unstable` tag based on commits to upstream `1000papercuts` branch."}
   - {date: "21.11.25:", desc: "Rebase to Ubuntu Jammy."}