Rebase to 3.20

This commit is contained in:
thespad
2024-05-31 15:09:15 +01:00
parent 27b64204b4
commit c48eef1549
7 changed files with 13 additions and 8 deletions

View File

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

View File

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

4
Jenkinsfile vendored
View File

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

View File

@@ -283,6 +283,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 to 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).
* **03.01.23:** - Publish stable release.

View File

@@ -6,7 +6,6 @@ custom_version_command: curl -sL "https://prowlarr.servarr.com/v1/update/master/
release_type: stable
release_tag: latest
ls_branch: main
build_armhf: false
repo_vars:
- BUILD_VERSION_ARG = 'PROWLARR_RELEASE'
- LS_USER = 'linuxserver'
@@ -21,8 +20,8 @@ repo_vars:
- CI_WEB='true'
- CI_PORT='9696'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_DELAY='60'
- CI_DOCKERENV=''
- CI_AUTH=''
- CI_WEBPATH='/system/status'
sponsor_links:

View File

@@ -39,6 +39,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "31.05.24:", desc: "Rebase Alpine 3.20." }
- { date: "20.03.24:", desc: "Rebase to 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: "03.01.23:", desc: "Publish stable release." }

View File

@@ -1,6 +1,8 @@
#!/bin/bash
if [[ -f /config/config.xml ]]; then
PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
fi
if [[ $(curl -sL "http://localhost:${PORT:-9696}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
exit 0