Merge pull request #36 from linuxserver/main-3.20

Rebase to 3.20 (main)
linuxserver · May 31, 2024 · 875086e · 875086e
2 parents 70dd6f0 + 935f624
commit 875086e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 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
@@ -45,6 +45,7 @@ RUN \
   rm -rf /app/overseerr/config && \
   ln -s /config /app/overseerr/config && \
   touch /config/DOCKER && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

diff --git a/Dockerfile.aarch64 b/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
 
 # set version label
 ARG BUILD_DATE
@@ -45,6 +45,7 @@ RUN \
   rm -rf /app/overseerr/config && \
   ln -s /config /app/overseerr/config && \
   touch /config/DOCKER && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='5055'
     CI_SSL='false'
     CI_DELAY='300'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

diff --git a/README.md b/README.md
@@ -280,6 +280,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **18.12.22:** - Rebase main to 3.17.

diff --git a/jenkins-vars.yml b/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 = 'sct'
@@ -25,8 +24,8 @@ repo_vars:
   - CI_PORT='5055'
   - CI_SSL='false'
   - CI_DELAY='300'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
 sponsor_links:
   - { name: "Overseerr Github Sponsors", url: "https://github.com/sponsors/sct" }

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -24,10 +24,6 @@ development_versions_items:
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 
-param_usage_include_env: true
-param_env_vars:
-  - { env_var: "TZ", env_value: "America/New_York", desc: "Specify a timezone to use EG America/New_York"}
-
 param_usage_include_ports: true
 param_ports:
   - { external_port: "5055", internal_port: "5055", port_desc: "Port for Overseerr's web interface." }
@@ -36,16 +32,14 @@ param_usage_include_vols: true
 param_volumes:
   - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
 
-# optional parameters
-opt_param_usage_include_vols: false
-
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
   Access the webui at `<your-ip>:5055`, for more information check out [Overseerr](https://overseerr.dev/).
 
 # changelog
 changelogs:
+  - { date: "31.05.24:", desc: "Rebase to Alpine 3.20."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "18.12.22:", desc: "Rebase main to 3.17." }