Merge pull request #28 from thelamer/preview

swapping preview over to netcore builds

Dockerfile

@@ -1,11 +1,11 @@
-FROM lsiobase/mono:LTS
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG LIDARR_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="thelamer"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -16,24 +16,23 @@ RUN \
  echo "**** install packages ****" && \
  apt-get update && \
  apt-get install --no-install-recommends -y \
-        libchromaprint-tools \
-        jq && \
+	jq \
+	libicu60 && \
  echo "**** install lidarr ****" && \
  mkdir -p /app/lidarr && \
  if [ -z ${LIDARR_RELEASE+x} ]; then \
 	LIDARR_RELEASE=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
  fi && \
- lidarr_url=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \
-	| jq -r "first(.[] | select(.version == \"${LIDARR_RELEASE}\")) | .url") && \
  curl -o \
  /tmp/lidarr.tar.gz -L \
-	"${lidarr_url}" && \
+	"https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/updatefile?version=${LIDARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \
  tar ixzf \
  /tmp/lidarr.tar.gz -C \
 	/app/lidarr --strip-components=1 && \
  echo "**** cleanup ****" && \
  rm -rf \
+	/app/lidarr/Lidarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
@@ -43,4 +42,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
-VOLUME /config /downloads /music
+VOLUME /config

Dockerfile.aarch64

@@ -1,11 +1,11 @@
-FROM lsiobase/mono:arm64v8-LTS
+FROM lsiobase/ubuntu:arm64v8-bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG LIDARR_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="thelamer"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -16,24 +16,23 @@ RUN \
  echo "**** install packages ****" && \
  apt-get update && \
  apt-get install --no-install-recommends -y \
-        libchromaprint-tools \
-        jq && \
+	jq \
+	libicu60 && \
  echo "**** install lidarr ****" && \
  mkdir -p /app/lidarr && \
  if [ -z ${LIDARR_RELEASE+x} ]; then \
 	LIDARR_RELEASE=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
  fi && \
- lidarr_url=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \
-	| jq -r "first(.[] | select(.version == \"${LIDARR_RELEASE}\")) | .url") && \
  curl -o \
  /tmp/lidarr.tar.gz -L \
-	"${lidarr_url}" && \
+	"https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/updatefile?version=${LIDARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \
  tar ixzf \
  /tmp/lidarr.tar.gz -C \
 	/app/lidarr --strip-components=1 && \
  echo "**** cleanup ****" && \
  rm -rf \
+	/app/lidarr/Lidarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
@@ -43,4 +42,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
-VOLUME /config /downloads /music
+VOLUME /config

Dockerfile.armhf

@@ -1,11 +1,11 @@
-FROM lsiobase/mono:arm32v7-LTS
+FROM lsiobase/ubuntu:bionic
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG LIDARR_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="thelamer"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -16,24 +16,23 @@ RUN \
  echo "**** install packages ****" && \
  apt-get update && \
  apt-get install --no-install-recommends -y \
-        libchromaprint-tools \
-        jq && \
+	jq \
+	libicu60 && \
  echo "**** install lidarr ****" && \
  mkdir -p /app/lidarr && \
  if [ -z ${LIDARR_RELEASE+x} ]; then \
 	LIDARR_RELEASE=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
  fi && \
- lidarr_url=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \
-	| jq -r "first(.[] | select(.version == \"${LIDARR_RELEASE}\")) | .url") && \
  curl -o \
  /tmp/lidarr.tar.gz -L \
-	"${lidarr_url}" && \
+	"https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/updatefile?version=${LIDARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \
  tar ixzf \
  /tmp/lidarr.tar.gz -C \
 	/app/lidarr --strip-components=1 && \
  echo "**** cleanup ****" && \
  rm -rf \
+	/app/lidarr/Lidarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
@@ -43,4 +42,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 8686
-VOLUME /config /downloads /music
+VOLUME /config

README.md

@@ -206,6 +206,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.10.19:** - Switch preview branch to netcore builds.
 * **01.08.19:** - Rebase to Linuxserver LTS mono version.
 * **13.06.19:** - Add env variable for setting umask.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.

readme-vars.yml

@@ -46,6 +46,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "29.10.19:", desc: "Switch preview branch to netcore builds." }
   - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." }
   - { date: "13.06.19:", desc: "Add env variable for setting umask." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }

root/etc/cont-init.d/30-config

@@ -2,5 +2,4 @@
 
 # permissions
 chown -R abc:abc \
-	/app/lidarr \
 	/config

root/etc/services.d/lidarr/run

@@ -1,11 +1,10 @@
 #!/usr/bin/with-contenv bash
 
-# cd /app/lidarr || exit
+# cd /app/lidarr || exit
 
 UMASK_SET=${UMASK_SET:-022}
 umask "$UMASK_SET"
 
-
 exec \
-	s6-setuidgid abc mono --debug /app/lidarr/Lidarr.exe \
+	s6-setuidgid abc /app/lidarr/Lidarr \
 	-nobrowser -data=/config