From 5ab25e2fe723c97b383876f85bd987aba4f8e73d Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 20 Feb 2022 12:14:36 +0000 Subject: [PATCH] Rebase develop branch to Alpine --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 25 +++++++++++-------------- Dockerfile.aarch64 | 25 +++++++++++-------------- Dockerfile.armhf | 25 +++++++++++-------------- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + 8 files changed, 40 insertions(+), 47 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 7566887..2e782e7 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_DEVELOP\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linux | jq -r '.[0].version') + EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for radarr branch develop" diff --git a/Dockerfile b/Dockerfile index f3f5326..fc966d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,43 +1,40 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" +LABEL maintainer="Roxedus,thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="develop" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ + apk add -U --upgrade --no-cache \ + curl \ jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ + icu-libs \ + sqlite-libs && \ echo "**** install radarr ****" && \ mkdir -p /app/radarr/bin && \ 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'); \ fi && \ curl -o \ /tmp/radarr.tar.gz -L \ - "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ - tar ixzf \ - /tmp/radarr.tar.gz -C \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=x64" && \ + tar xzf \ + /tmp/radarr.tar.gz -C \ /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://www.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 ****" && \ rm -rf \ /app/radarr/bin/Radarr.Update \ /tmp/* \ - /var/lib/apt/lists/* \ /var/tmp/* # copy local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8762d19..f708fdb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,43 +1,40 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" +LABEL maintainer="Roxedus,thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="develop" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ + apk add -U --upgrade --no-cache \ + curl \ jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ + icu-libs \ + sqlite-libs && \ echo "**** install radarr ****" && \ mkdir -p /app/radarr/bin && \ 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'); \ fi && \ curl -o \ /tmp/radarr.tar.gz -L \ - "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ - tar ixzf \ - /tmp/radarr.tar.gz -C \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm64" && \ + tar xzf \ + /tmp/radarr.tar.gz -C \ /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://www.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 ****" && \ rm -rf \ /app/radarr/bin/Radarr.Update \ /tmp/* \ - /var/lib/apt/lists/* \ /var/tmp/* # copy local files diff --git a/Dockerfile.armhf b/Dockerfile.armhf index aed063c..a400650 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,43 +1,40 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" +LABEL maintainer="Roxedus,thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="develop" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ + apk add -U --upgrade --no-cache \ + curl \ jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ + icu-libs \ + sqlite-libs && \ echo "**** install radarr ****" && \ mkdir -p /app/radarr/bin && \ 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'); \ fi && \ curl -o \ /tmp/radarr.tar.gz -L \ - "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ - tar ixzf \ - /tmp/radarr.tar.gz -C \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm" && \ + tar xzf \ + /tmp/radarr.tar.gz -C \ /app/radarr/bin --strip-components=1 && \ + echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.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 "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ rm -rf \ /app/radarr/bin/Radarr.Update \ /tmp/* \ - /var/lib/apt/lists/* \ /var/tmp/* # copy local files diff --git a/Jenkinsfile b/Jenkinsfile index 29ef6ad..a34821e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { DOCKERHUB_IMAGE = 'linuxserver/radarr' DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr' PR_DOCKERHUB_IMAGE = 'lspipepr/radarr' - DIST_IMAGE = 'ubuntu' + DIST_IMAGE = 'alpine' MULTIARCH='true' CI='true' CI_WEB='true' @@ -104,7 +104,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linux | jq -r '.[0].version' ''', + script: ''' curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 2fc8009..20282fd 100644 --- a/README.md +++ b/README.md @@ -247,6 +247,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.02.22:** - Rebase develop branch to Alpine. * **17.10.21:** - Remove `UMASK_SET`. * **11.07.21:** - Make the paths clearer to the user * **17.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 97bfe93..34af07c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,7 @@ # jenkins variables project_name: docker-radarr external_type: na -custom_version_command: curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linux | jq -r '.[0].version' +custom_version_command: curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version' release_type: prerelease release_tag: develop ls_branch: develop @@ -14,7 +14,7 @@ repo_vars: - DOCKERHUB_IMAGE = 'linuxserver/radarr' - DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/radarr' - - DIST_IMAGE = 'ubuntu' + - DIST_IMAGE = 'alpine' - MULTIARCH='true' - CI='true' - CI_WEB='true' diff --git a/readme-vars.yml b/readme-vars.yml index 761ea84..9023cd1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -56,6 +56,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." } - { date: "17.10.21:", desc: "Remove `UMASK_SET`." } - { date: "11.07.21:", desc: "Make the paths clearer to the user" } - { date: "17.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }