Merge pull request #23 from linuxserver/3.20

Rebase to 3.20
linuxserver · May 31, 2024 · f6c22d5 · f6c22d5
2 parents cab5279 + 37a4084
commit f6c22d5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 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
@@ -36,6 +36,7 @@ RUN \
   curl -o \
   ${BOOKSONIC_AIR_HOME}/booksonic.war -L \
     "https://github.com/popeen/Booksonic-Air/releases/download/${BOOKSONIC_AIR_RELEASE}/booksonic.war" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

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
@@ -36,6 +36,7 @@ RUN \
   curl -o \
   ${BOOKSONIC_AIR_HOME}/booksonic.war -L \
     "https://github.com/popeen/Booksonic-Air/releases/download/${BOOKSONIC_AIR_RELEASE}/booksonic.war" && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

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

diff --git a/README.md b/README.md
@@ -285,6 +285,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **10.07.23:** - Rebase to Alpine 3.18.
 * **25.12.22:** - Rebase to Alpine 3.17, migrate to s6v3, bump jre to 11, deprecate armhf.

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: master
-build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'popeen'
@@ -25,6 +24,6 @@ repo_vars:
   - CI_PORT='4040'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -40,6 +40,7 @@ app_setup_block: "While this is a more up to date rebase of the original Bookson
 
 # changelog
 changelogs:
+  - { date: "31.05.24:", desc: "Rebase to Alpine 3.20." }
   - { date: "20.03.24:", desc: "Rebase to Alpine 3.19." }
   - { date: "10.07.23:", desc: "Rebase to Alpine 3.18." }
   - { date: "25.12.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3, bump jre to 11, deprecate armhf." }