Merge pull request #35 from linuxserver/develop-3.20

Rebase to 3.20 (Develop)
This commit is contained in:
Adam 2024-05-26 18:39:49 +01:00 committed by GitHub
commit 873430a49a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 7 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
@ -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 && \

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
@ -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 && \

4
Jenkinsfile vendored
View File

@ -31,8 +31,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 {

View File

@ -280,6 +280,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **26.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 develop to 3.17.

View File

@ -7,7 +7,6 @@ custom_version_command: "curl -sX GET https://api.github.com/repos/sct/overseerr
release_type: prerelease
release_tag: develop
ls_branch: develop
build_armhf: false
repo_vars:
- BUILD_VERSION_ARG = 'OVERSEERR_VERSION'
- LS_USER = 'linuxserver'
@ -23,8 +22,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" }

View File

@ -46,6 +46,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "26.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 develop to 3.17." }