Merge pull request #23 from linuxserver/3.20

Rebase to 3.20

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
 
 ARG BUILD_DATE
 ARG VERSION
@@ -45,15 +45,18 @@ 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/ -r /app/changedetection/requirements.txt && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \
   PLAYWRIGHT_PY_RELEASE=$(curl -sX GET "https://api.github.com/repos/microsoft/playwright-python/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   git clone --depth 1 --branch "${PLAYWRIGHT_PY_RELEASE}" https://github.com/microsoft/playwright-python /tmp/playwright-python && \
   cd /tmp/playwright-python && \
   pip install -U --no-cache-dir . && \
-  rm -f /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \
-  ln -s /usr/bin/node /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \
+  rm -f /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \
+  ln -s /usr/bin/node /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+  echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 ARG BUILD_DATE
 ARG VERSION
@@ -45,16 +45,19 @@ 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/ -r /app/changedetection/requirements.txt && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r /app/changedetection/requirements.txt && \
   echo "**** install playwright ****" && \
   PLAYWRIGHT_PY_RELEASE=$(curl -sX GET "https://api.github.com/repos/microsoft/playwright-python/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   git clone --depth 1 --branch "${PLAYWRIGHT_PY_RELEASE}" https://github.com/microsoft/playwright-python /tmp/playwright-python && \
   cd /tmp/playwright-python && \
   pip install -U --no-cache-dir . && \
-  rm -f /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \
-  ln -s /usr/bin/node /lsiopy/lib/python3.11/site-packages/playwright/driver/node && \
+  rm -f /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \
+  ln -s /usr/bin/node /lsiopy/lib/python3.12/site-packages/playwright/driver/node && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+  echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \

Jenkinsfile

@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='5000'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=Europe/London'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

README.md

@@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.24:** - Rebase to Alpine 3.20.
 * **09.03.24:** - Build Playwright from source because Microsoft's build and packaging process is awful.
 * **08.03.24:** - Build Playwright-python from source, add libjpeg.
 * **23.12.23:** - Rebase to Alpine 3.19.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: main
-build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'dgtlmoon'
@@ -25,6 +24,6 @@ repo_vars:
   - CI_PORT='5000'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=Europe/London'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''

readme-vars.yml

@@ -12,9 +12,6 @@ available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 
-# development version
-development_versions: false
-
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
@@ -25,9 +22,6 @@ param_volumes:
 param_usage_include_ports: true
 param_ports:
   - { external_port: "5000", internal_port: "5000", port_desc: "WebUI" }
-param_usage_include_env: true
-param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
 
 # optional container parameters
 opt_param_usage_include_env: true
@@ -64,6 +58,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.05.24:", desc: "Rebase to Alpine 3.20."}
   - { date: "09.03.24:", desc: "Build Playwright from source because Microsoft's build and packaging process is awful."}
   - { date: "08.03.24:", desc: "Build Playwright-python from source, add libjpeg."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}