Rebase nightly branch to Alpine

2022-02-04 11:37:22 +00:00
parent c84b997e79
commit dee8c4945c
7 changed files with 39 additions and 43 deletions
--- a/22
+++ b/22
@@ -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 \
+    "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
--- 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 \
+    "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
--- 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 \
+    "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
--- a/4
+++ b/4
@@ -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=''
  }
--- 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
--- 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:
--- 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" }