Merge pull request #57 from linuxserver/master-3.20

Rebase to 3.20

Dockerfile

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/unrar:latest as unrar
+FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -37,10 +37,12 @@ RUN \
   python3 -m venv /lsiopy && \
   pip install -U --no-cache-dir \
     pip \
+    setuptools \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     certifi \
     sickchill=="${SICKCHILL_VERSION}" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** clean up ****" && \
   apk del --purge \
     build-dependencies && \

Dockerfile.aarch64

@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar
+FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -37,10 +37,12 @@ RUN \
   python3 -m venv /lsiopy && \
   pip install -U --no-cache-dir \
     pip \
+    setuptools \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     certifi \
     sickchill=="${SICKCHILL_VERSION}" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** clean up ****" && \
   apk del --purge \
     build-dependencies && \

Jenkinsfile

@@ -31,9 +31,9 @@ pipeline {
     CI_WEB = 'true'
     CI_PORT = '8081'
     CI_SSL = 'false'
-    CI_DELAY = '240'
-    CI_DOCKERENV = 'TZ=Europe/London'
-    CI_AUTH = 'user:password'
+    CI_DELAY = '120'
+    CI_DOCKERENV = ''
+    CI_AUTH = ''
     CI_WEBPATH = ''
   }
   stages {

README.md

@@ -79,8 +79,8 @@ services:
       - TZ=Etc/UTC
     volumes:
       - /path/to/sickchill/config:/config
-      - /path/to/data:/downloads
-      - /path/to/data:/tv
+      - /path/to/downloads:/downloads #optional
+      - /path/to/tv:/tv #optional
     ports:
       - 8081:8081
     restart: unless-stopped
@@ -96,8 +96,8 @@ docker run -d \
   -e TZ=Etc/UTC \
   -p 8081:8081 \
   -v /path/to/sickchill/config:/config \
-  -v /path/to/data:/downloads \
-  -v /path/to/data:/tv \
+  -v /path/to/downloads:/downloads `#optional` \
+  -v /path/to/tv:/tv `#optional` \
   --restart unless-stopped \
   lscr.io/linuxserver/sickchill:latest
 ```
@@ -277,6 +277,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **10.07.24:** - Rebase to Alpine 3.20.
 * **13.02.24:** - Rebase to Alpine 3.19.
 * **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).
 * **10.08.23:** - Bump unrar to 6.2.10.

jenkins-vars.yml

@@ -21,9 +21,9 @@ repo_vars:
   - CI_WEB = 'true'
   - CI_PORT = '8081'
   - CI_SSL = 'false'
-  - CI_DELAY = '240'
-  - CI_DOCKERENV = 'TZ=Europe/London'
-  - CI_AUTH = 'user:password'
+  - CI_DELAY = '120'
+  - CI_DOCKERENV = ''
+  - CI_AUTH = ''
   - CI_WEBPATH = ''
 sponsor_links:
   - { name: "SickChill", url: "https://www.patreon.com/SickChill" }

readme-vars.yml

@@ -14,21 +14,21 @@ available_architectures:
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
-  - {vol_path: "/downloads", vol_host_path: "/path/to/data", desc: "this will store any downloaded data on the docker host"}
-  - {vol_path: "/tv", vol_host_path: "/path/to/data", desc: "this will allow sickchill to view what you already have"}
-param_usage_include_env: true
-param_env_vars:
-  - {env_var: "TZ", env_value: "Europe/London", desc: "specify your TimeZone e.g. Europe/London"}
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"}
 param_usage_include_ports: true
 param_ports:
   - {external_port: "8081", internal_port: "8081", port_desc: "will map the container's port 8081 to port 8081 on the host"}
+opt_param_usage_include_vols: true
+opt_param_volumes:
+  - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "this will store any downloaded data on the docker host"}
+  - {vol_path: "/tv", vol_host_path: "/path/to/tv", desc: "this will allow sickchill to view what you already have"}
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
   Web interface is at `<your ip>:8081` , set paths for downloads, tv-shows to match docker mappings via the webui.
 # changelog
 changelogs:
+  - {date: "10.07.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "13.02.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}
   - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."}