cphipps/radarr
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rebase master to Alpine 3.15

Browse Source
This commit is contained in:
TheSpad
2022-06-06 20:58:38 +01:00
parent 3a15f55495
commit 673f843517
8 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/external_trigger.yml vendored
View File

@@ -18,7 +18,7 @@ jobs:
fi fi
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER\". ****" echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER\". ****"
echo "**** Retrieving external version ****" echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version') EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version')
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****" echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for radarr branch master" FAILURE_REASON="Can't retrieve external version for radarr branch master"

15
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal FROM ghcr.io/linuxserver/baseimage-alpine:3.15
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -8,7 +8,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer" LABEL maintainer="thelamer"
# environment settings # environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ARG RADARR_BRANCH="master" ARG RADARR_BRANCH="master"
ENV XDG_CONFIG_HOME="/config/xdg" ENV XDG_CONFIG_HOME="/config/xdg"
@@ -23,22 +22,20 @@ RUN \
echo "**** install radarr ****" && \ echo "**** install radarr ****" && \
mkdir -p /app/radarr/bin && \ mkdir -p /app/radarr/bin && \
if [ -z ${RADARR_RELEASE+x} ]; then \ if [ -z ${RADARR_RELEASE+x} ]; then \
RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \ RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \
| jq -r '.[0].version'); \ | jq -r '.[0].version'); \
fi && \ fi && \
curl -o \ curl -o \
/tmp/radarr.tar.gz -L \ /tmp/radarr.tar.gz -L \
"https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=x64" && \
tar ixzf \ tar xzf \
/tmp/radarr.tar.gz -C \ /tmp/radarr.tar.gz -C \
/app/radarr/bin --strip-components=1 && \ /app/radarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/app/radarr/bin/Radarr.Update \ /app/radarr/bin/Radarr.Update \
/tmp/* \ /tmp/*
/var/lib/apt/lists/* \
/var/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

14
Dockerfile.aarch64
View File

@@ -7,8 +7,6 @@ ARG RADARR_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer" LABEL maintainer="thelamer"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ARG RADARR_BRANCH="master" ARG RADARR_BRANCH="master"
ENV XDG_CONFIG_HOME="/config/xdg" ENV XDG_CONFIG_HOME="/config/xdg"
@@ -23,22 +21,20 @@ RUN \
echo "**** install radarr ****" && \ echo "**** install radarr ****" && \
mkdir -p /app/radarr/bin && \ mkdir -p /app/radarr/bin && \
if [ -z ${RADARR_RELEASE+x} ]; then \ if [ -z ${RADARR_RELEASE+x} ]; then \
RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \ RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \
| jq -r '.[0].version'); \ | jq -r '.[0].version'); \
fi && \ fi && \
curl -o \ curl -o \
/tmp/radarr.tar.gz -L \ /tmp/radarr.tar.gz -L \
"https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm64" && \
tar ixzf \ tar xzf \
/tmp/radarr.tar.gz -C \ /tmp/radarr.tar.gz -C \
/app/radarr/bin --strip-components=1 && \ /app/radarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/app/radarr/bin/Radarr.Update \ /app/radarr/bin/Radarr.Update \
/tmp/* \ /tmp/*
/var/lib/apt/lists/* \
/var/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

13
Dockerfile.armhf
View File

@@ -8,7 +8,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer" LABEL maintainer="thelamer"
# environment settings # environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ARG RADARR_BRANCH="master" ARG RADARR_BRANCH="master"
ENV XDG_CONFIG_HOME="/config/xdg" ENV XDG_CONFIG_HOME="/config/xdg"
@@ -23,22 +22,20 @@ RUN \
echo "**** install radarr ****" && \ echo "**** install radarr ****" && \
mkdir -p /app/radarr/bin && \ mkdir -p /app/radarr/bin && \
if [ -z ${RADARR_RELEASE+x} ]; then \ if [ -z ${RADARR_RELEASE+x} ]; then \
RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \ RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \
| jq -r '.[0].version'); \ | jq -r '.[0].version'); \
fi && \ fi && \
curl -o \ curl -o \
/tmp/radarr.tar.gz -L \ /tmp/radarr.tar.gz -L \
"https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm" && \
tar ixzf \ tar xzf \
/tmp/radarr.tar.gz -C \ /tmp/radarr.tar.gz -C \
/app/radarr/bin --strip-components=1 && \ /app/radarr/bin --strip-components=1 && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \
rm -rf \ rm -rf \
/app/radarr/bin/Radarr.Update \ /app/radarr/bin/Radarr.Update \
/tmp/* \ /tmp/*
/var/lib/apt/lists/* \
/var/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

4
Jenkinsfile vendored
View File

@@ -24,7 +24,7 @@ pipeline {
DOCKERHUB_IMAGE = 'linuxserver/radarr' DOCKERHUB_IMAGE = 'linuxserver/radarr'
DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr' DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr'
PR_DOCKERHUB_IMAGE = 'lspipepr/radarr' PR_DOCKERHUB_IMAGE = 'lspipepr/radarr'
DIST_IMAGE = 'ubuntu' DIST_IMAGE = 'alpine'
MULTIARCH='true' MULTIARCH='true'
CI='true' CI='true'
CI_WEB='true' CI_WEB='true'
@@ -104,7 +104,7 @@ pipeline {
steps{ steps{
script{ script{
env.EXT_RELEASE = sh( env.EXT_RELEASE = sh(
script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version' ''', script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version' ''',
returnStdout: true).trim() returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command' env.RELEASE_LINK = 'custom_command'
} }

1
README.md
View File

@@ -245,6 +245,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **06.06.22:** - Rebase master branch to Alpine 3.15.
* **20.02.22:** - Rebase develop branch to Alpine. * **20.02.22:** - Rebase develop branch to Alpine.
* **04.02.22:** - Rebase nightly branch to Alpine and deprecate nightly-alpine branch. * **04.02.22:** - Rebase nightly branch to Alpine and deprecate nightly-alpine branch.
* **27.12.21:** - Add nightly-alpine branch. * **27.12.21:** - Add nightly-alpine branch.

4
jenkins-vars.yml
View File

@@ -2,7 +2,7 @@
# jenkins variables # jenkins variables
project_name: docker-radarr project_name: docker-radarr
external_type: na external_type: na
custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version' custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version'
release_type: stable release_type: stable
release_tag: latest release_tag: latest
ls_branch: master ls_branch: master
@@ -14,7 +14,7 @@ repo_vars:
- DOCKERHUB_IMAGE = 'linuxserver/radarr' - DOCKERHUB_IMAGE = 'linuxserver/radarr'
- DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr' - DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr'
- PR_DOCKERHUB_IMAGE = 'lspipepr/radarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/radarr'
- DIST_IMAGE = 'ubuntu' - DIST_IMAGE = 'alpine'
- MULTIARCH='true' - MULTIARCH='true'
- CI='true' - CI='true'
- CI_WEB='true' - CI_WEB='true'

1
readme-vars.yml
View File

@@ -56,6 +56,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "06.06.22:", desc: "Rebase master branch to Alpine 3.15." }
- { date: "20.02.22:", desc: "Rebase develop branch to Alpine." } - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }
- { date: "04.02.22:", desc: "Rebase nightly branch to Alpine and deprecate nightly-alpine branch." } - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine and deprecate nightly-alpine branch." }
- { date: "27.12.21:", desc: "Add nightly-alpine branch." } - { date: "27.12.21:", desc: "Add nightly-alpine branch." }