From 9de23e50833a45e03fd9ac817acda399e5aa0814 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 30 Jan 2019 15:10:42 -0500 Subject: [PATCH 1/2] fix radarr version arg, switch to https for download url --- Dockerfile | 10 +++++----- Dockerfile.aarch64 | 10 +++++----- Dockerfile.armhf | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a9ed0c..bbcfacd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM lsiobase/mono:xenial # set version label ARG BUILD_DATE ARG VERSION -ARG RADARR_VERSION +ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" @@ -18,12 +18,12 @@ RUN \ apt-get install -y \ jq && \ echo "**** install radarr ****" && \ - if [ -z ${RADARR_VERSION+x} ]; then \ - RADARR_VERSION=$(curl "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + if [ -z ${RADARR_RELEASE}+x} ]; then \ + RADARR_RELEASE=$(curl "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -sX GET "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ - | select(.version == \"${RADARR_VERSION}\") | .url") && \ + radarr_url=$(curl -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ + | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ /opt/radarr && \ curl -o \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4d099ce..d0ae12f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -6,7 +6,7 @@ COPY qemu-aarch64-static /usr/bin # set version label ARG BUILD_DATE ARG VERSION -ARG RADARR_VERSION +ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" @@ -21,12 +21,12 @@ RUN \ apt-get install -y \ jq && \ echo "**** install radarr ****" && \ - if [ -z ${RADARR_VERSION+x} ]; then \ - RADARR_VERSION=$(curl "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + if [ -z ${RADARR_RELEASE+x} ]; then \ + RADARR_RELEASE=$(curl "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -sX GET "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ - | select(.version == \"${RADARR_VERSION}\") | .url") && \ + radarr_url=$(curl -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ + | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ /opt/radarr && \ curl -o \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index ac46c7b..4cedfe9 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -6,7 +6,7 @@ COPY qemu-arm-static /usr/bin # set version label ARG BUILD_DATE ARG VERSION -ARG RADARR_VERSION +ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="sparklyballs" @@ -21,12 +21,12 @@ RUN \ apt-get install -y \ jq && \ echo "**** install radarr ****" && \ - if [ -z ${RADARR_VERSION+x} ]; then \ - RADARR_VERSION=$(curl "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + if [ -z ${RADARR_RELEASE+x} ]; then \ + RADARR_RELEASE=$(curl "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -sX GET "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ - | select(.version == \"${RADARR_VERSION}\") | .url") && \ + radarr_url=$(curl -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ + | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ /opt/radarr && \ curl -o \ From d06182a46edf706f5266c535b0d337e855b905e9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 30 Jan 2019 16:21:19 -0500 Subject: [PATCH 2/2] ignore curl cert errors until we figure out issue with builders --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index bbcfacd..84210be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,10 +19,10 @@ RUN \ jq && \ echo "**** install radarr ****" && \ if [ -z ${RADARR_RELEASE}+x} ]; then \ - RADARR_RELEASE=$(curl "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + RADARR_RELEASE=$(curl -k "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ + radarr_url=$(curl -k -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ /opt/radarr && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d0ae12f..b7e1839 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,10 +22,10 @@ RUN \ jq && \ echo "**** install radarr ****" && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + RADARR_RELEASE=$(curl -k "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ + radarr_url=$(curl -k -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ /opt/radarr && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4cedfe9..ebc354f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -22,10 +22,10 @@ RUN \ jq && \ echo "**** install radarr ****" && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + RADARR_RELEASE=$(curl -k "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ + radarr_url=$(curl -k -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ /opt/radarr && \