Rebase to 3.20

linuxserver · May 31, 2024 · dd74475 · dd74475
1 parent a277772
commit dd74475
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 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
@@ -33,6 +33,7 @@ RUN \
  /tmp/lidarr.tar.gz -C \
  /app/lidarr/bin --strip-components=1 && \
  echo -e "UpdateMethod=docker\nBranch=${LIDARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/lidarr/package_info && \
+ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
  /app/lidarr/bin/Lidarr.Update \

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
@@ -33,6 +33,7 @@ RUN \
  /tmp/lidarr.tar.gz -C \
  /app/lidarr/bin --strip-components=1 && \
  echo -e "UpdateMethod=docker\nBranch=${LIDARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/lidarr/package_info && \
+ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
  /app/lidarr/bin/Lidarr.Update \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
  CI_WEB='true'
  CI_PORT='8686'
  CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific'
+ CI_DELAY='60'
+ CI_DOCKERENV=''
  CI_AUTH=''
  CI_WEBPATH='/system/status'
  }

diff --git a/README.md b/README.md
@@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.24:** - Rebase Alpine 3.20.
 * **20.03.24:** - Rebase Alpine 3.19.
 * **06.06.23:** - Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
 * **17.01.23:** - Rebase master branch to Alpine 3.17, migrate to s6v3.

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -6,7 +6,6 @@ custom_version_command: curl -sL "https://lidarr.servarr.com/v1/update/master/ch
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
  - BUILD_VERSION_ARG = 'LIDARR_RELEASE'
  - LS_USER = 'linuxserver'
@@ -21,8 +20,8 @@ repo_vars:
  - CI_WEB='true'
  - CI_PORT='8686'
  - CI_SSL='false'
- - CI_DELAY='120'
- - CI_DOCKERENV='TZ=US/Pacific'
+ - CI_DELAY='60'
+ - CI_DOCKERENV=''
  - CI_AUTH=''
  - CI_WEBPATH='/system/status'
 sponsor_links:

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -53,6 +53,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+ - { date: "31.05.24:", desc: "Rebase Alpine 3.20." }
  - { date: "20.03.24:", desc: "Rebase Alpine 3.19." }
  - { date: "06.06.23:", desc: "Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
  - { date: "17.01.23:", desc: "Rebase master branch to Alpine 3.17, migrate to s6v3." }

diff --git a/root/etc/s6-overlay/s6-rc.d/svc-lidarr/data/check b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/data/check
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
+if [[ -f /config/config.xml ]]; then
+ PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
+fi
 
 if [[ $(curl -sL "http://localhost:${PORT:-8686}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
  exit 0