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

Use runtime when checking for updates.

Browse Source
This commit is contained in:
Roxedus
2021-07-11 23:26:12 +02:00
parent e130655a7e
commit 573f23d3ab
10 changed files with 86 additions and 87 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?os=linux | jq -r '.[0].version') EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | 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"

52
Dockerfile
View File

@@ -13,32 +13,32 @@ ARG RADARR_BRANCH="master"
ENV XDG_CONFIG_HOME="/config/xdg" ENV XDG_CONFIG_HOME="/config/xdg"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt-get update && \ apt-get update && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
jq \ jq \
libicu66 \ libicu66 \
libmediainfo0v5 \ libmediainfo0v5 \
sqlite3 && \ sqlite3 && \
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?os=linux" \ RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \
| 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=linux&runtime=netcore&arch=x64" && \
tar ixzf \ tar ixzf \
/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 "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /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/lib/apt/lists/* \
/var/tmp/* /var/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

52
Dockerfile.aarch64
View File

@@ -13,32 +13,32 @@ ARG RADARR_BRANCH="master"
ENV XDG_CONFIG_HOME="/config/xdg" ENV XDG_CONFIG_HOME="/config/xdg"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt-get update && \ apt-get update && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
jq \ jq \
libicu66 \ libicu66 \
libmediainfo0v5 \ libmediainfo0v5 \
sqlite3 && \ sqlite3 && \
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?os=linux" \ RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \
| 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=linux&runtime=netcore&arch=arm64" && \
tar ixzf \ tar ixzf \
/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 "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /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/lib/apt/lists/* \
/var/tmp/* /var/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

52
Dockerfile.armhf
View File

@@ -13,32 +13,32 @@ ARG RADARR_BRANCH="master"
ENV XDG_CONFIG_HOME="/config/xdg" ENV XDG_CONFIG_HOME="/config/xdg"
RUN \ RUN \
echo "**** install packages ****" && \ echo "**** install packages ****" && \
apt-get update && \ apt-get update && \
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
jq \ jq \
libicu66 \ libicu66 \
libmediainfo0v5 \ libmediainfo0v5 \
sqlite3 && \ sqlite3 && \
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?os=linux" \ RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \
| 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=linux&runtime=netcore&arch=arm" && \
tar ixzf \ tar ixzf \
/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 "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /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/lib/apt/lists/* \
/var/tmp/* /var/tmp/*
# copy local files # copy local files
COPY root/ / COPY root/ /

2
Jenkinsfile vendored
View File

@@ -103,7 +103,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?os=linux | jq -r '.[0].version' ''', script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version' ''',
returnStdout: true).trim() returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command' env.RELEASE_LINK = 'custom_command'
} }

2
README.md
View File

@@ -76,7 +76,7 @@ We have set `/movies` and `/downloads` as ***optional paths***, this is because
Use the optional paths if you dont understand, or dont want hardlinks/atomic moves. Use the optional paths if you dont understand, or dont want hardlinks/atomic moves.
The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/Docker_Guide#Consistent_and_well_planned_paths) on how to get started with this. The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this.
## Usage ## Usage

3
jenkins-vars.yml
View File

@@ -1,9 +1,8 @@
--- ---
# 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?os=linux | jq -r '.[0].version' custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version'
release_type: stable release_type: stable
release_tag: latest release_tag: latest
ls_branch: master ls_branch: master

2
readme-vars.yml
View File

@@ -52,7 +52,7 @@ app_setup_block: |
Use the optional paths if you dont understand, or dont want hardlinks/atomic moves. Use the optional paths if you dont understand, or dont want hardlinks/atomic moves.
The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/Docker_Guide#Consistent_and_well_planned_paths) on how to get started with this. The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this.
# changelog # changelog
changelogs: changelogs:

2
root/etc/cont-init.d/30-config
View File

@@ -2,4 +2,4 @@
# permissions # permissions
chown -R abc:abc \ chown -R abc:abc \
/config /config

4
root/etc/services.d/radarr/run
View File

@@ -8,5 +8,5 @@ fi
cd /app/radarr/bin || exit cd /app/radarr/bin || exit
exec \ exec \
s6-setuidgid abc /app/radarr/bin/Radarr \ s6-setuidgid abc /app/radarr/bin/Radarr \
-nobrowser -data=/config -nobrowser -data=/config