Merge pull request #58 from linuxserver/nightly-3.20

Rebase to 3.20 (nightly)
This commit is contained in:
Adam
2024-05-26 14:40:21 +01:00
committed by GitHub
6 changed files with 12 additions and 9 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=Europe/London'
CI_DELAY='60'
CI_DOCKERENV=''
CI_AUTH=''
CI_WEBPATH='/system/status'
}

View File

@@ -283,10 +283,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **25.05.24:** - Rebase to Alpine 3.20.
* **20.03.24:** - Rebase to Alpine 3.19.
* **06.06.23:** - Rebase nightly to Alpine 3.18.
* **19.12.22:** - Rebase nightly to Alpine 3.17.
* **27.10.22:** - Rebase nightly to Alpine 3.16, migrate to s6v3.
* **04.02.22:** - Rebase nightly branch to Alpine.
* **28.12.21:** - Add nightly-alpine branch.
* **06.06.21:** - Initial realease.
* **06.06.21:** - Initial release.

View File

@@ -6,7 +6,6 @@ custom_version_command: curl -sL "https://prowlarr.servarr.com/v1/update/nightly
release_type: prerelease
release_tag: nightly
ls_branch: nightly
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=Europe/London'
- CI_DELAY='60'
- CI_DOCKERENV=''
- CI_AUTH=''
- CI_WEBPATH='/system/status'
sponsor_links:

View File

@@ -38,10 +38,11 @@ app_setup_block: |
# changelog
changelogs:
- { date: "25.05.24:", desc: "Rebase to Alpine 3.20." }
- { date: "20.03.24:", desc: "Rebase to Alpine 3.19." }
- { date: "06.06.23:", desc: "Rebase nightly to Alpine 3.18." }
- { date: "19.12.22:", desc: "Rebase nightly to Alpine 3.17." }
- { date: "27.10.22:", desc: "Rebase nightly to Alpine 3.16, migrate to s6v3." }
- { date: "04.02.22:", desc: "Rebase nightly branch to Alpine." }
- { date: "28.12.21:", desc: "Add nightly-alpine branch." }
- { date: "06.06.21:", desc: "Initial realease." }
- { date: "06.06.21:", desc: "Initial release." }