From dee8c4945cce6eb247c0722e610733522dff0eeb Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 4 Feb 2022 11:37:22 +0000 Subject: [PATCH] Rebase nightly branch to Alpine --- Dockerfile | 24 +++++++++++------------- Dockerfile.aarch64 | 24 +++++++++++------------- Dockerfile.armhf | 24 +++++++++++------------- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 4 ++-- readme-vars.yml | 1 + 7 files changed, 39 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff13e4f..163558e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,42 +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="thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="nightly" 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 \ - 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 -L \ + "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" > /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 4dee74c..09a4e57 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,42 +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="thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="nightly" 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 \ - 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" > /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 0d45323..6fa8582 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,42 +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="thespad" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="nightly" 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 \ - 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 -L \ + "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" > /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 dd209b1..0da8c00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,14 +24,14 @@ 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' CI_PORT='7878' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' + CI_DOCKERENV='TZ=Europe/London' CI_AUTH='user:password' CI_WEBPATH='' } diff --git a/README.md b/README.md index 49a6356..327c64f 100644 --- a/README.md +++ b/README.md @@ -245,6 +245,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.02.22:** - Rebase nightly branch to Alpine. * **13.12.21:** - Remove unused dependencies. * **17.10.21:** - Remove `UMASK_SET`. * **11.07.21:** - Make the paths clearer to the user diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 8bf5862..00a9146 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,14 +15,14 @@ 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' - CI_PORT='7878' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' + - CI_DOCKERENV='TZ=Europe/London' - CI_AUTH='user:password' - CI_WEBPATH='' sponsor_links: diff --git a/readme-vars.yml b/readme-vars.yml index 46312b1..ef36046 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -56,6 +56,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine." } - { date: "13.12.21:", desc: "Remove unused dependencies." } - { date: "17.10.21:", desc: "Remove `UMASK_SET`." } - { date: "11.07.21:", desc: "Make the paths clearer to the user" }