From 0c406a6ed8617f5a148e05517dd793efb126bb2f Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 24 Feb 2018 16:36:44 +0000 Subject: [PATCH 1/2] first push up of develop branch --- Dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9cdb3d5..3d6bae1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,23 +7,30 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="sparklyballs" # environment settings +ARG DEBIAN_FRONTEND="noninteractive" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ + echo "**** install jq ****" && \ + apt-get update && \ + apt-get install -y \ + jq && \ echo "**** install radarr ****" && \ - radarr_tag=$(curl -sX GET "https://api.github.com/repos/Radarr/Radarr/releases" \ - | awk '/tag_name/{print $4;exit}' FS='[""]') && \ + radarr_url=$(curl "http://radarr.aeonlucid.com/v1/update/nightly/changes?os=linux" \ + | jq -r '.[0].url') && \ mkdir -p \ /opt/radarr && \ curl -o \ /tmp/radar.tar.gz -L \ - "https://github.com/Radarr/Radarr/releases/download/${radarr_tag}/Radarr.develop.${radarr_tag#v}.linux.tar.gz" && \ + "${radarr_url}" && \ tar ixzf \ /tmp/radar.tar.gz -C \ /opt/radarr --strip-components=1 && \ echo "**** clean up ****" && \ rm -rf \ - /tmp/* + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # add local files COPY /root / From d62defbf1227b23a5d07bb08c71834b593231d24 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 24 Feb 2018 17:57:45 +0000 Subject: [PATCH 2/2] add variable to choose branch --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d6bae1..841dbeb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,9 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" -# environment settings +# environment settings ARG DEBIAN_FRONTEND="noninteractive" +ARG RADARR_BRANCH="nightly" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ @@ -16,7 +17,7 @@ RUN \ apt-get install -y \ jq && \ echo "**** install radarr ****" && \ - radarr_url=$(curl "http://radarr.aeonlucid.com/v1/update/nightly/changes?os=linux" \ + radarr_url=$(curl "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].url') && \ mkdir -p \ /opt/radarr && \ @@ -32,9 +33,9 @@ RUN \ /var/lib/apt/lists/* \ /var/tmp/* -# add local files +# add local files COPY /root / -# ports and volumes +# ports and volumes EXPOSE 7878 VOLUME /config /downloads /movies