Merge remote-tracking branch 'linuxserver/master'

Dockerfile

@@ -1,6 +1,9 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/unrar:latest AS unrar
+
+FROM ghcr.io/linuxserver/baseimage-alpine:edge
 
-ARG UNRAR_VERSION=6.2.10
 # set version label
 ARG BUILD_DATE
 ARG VERSION
@@ -9,7 +12,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"
 
 # environment variables
-ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs"
+ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs" \
+  TMPDIR=/run/deluged-temp
 
 ENV FILEBOT_VERSION 4.7.19.5
 ENV FILEBOT_URL https://github.com/bigoulours/filebot/releases/download/$FILEBOT_VERSION/FileBot_$FILEBOT_VERSION-portable.tar.gz
@@ -26,46 +30,17 @@ RUN \
     py3-geoip \
     py3-requests \
     p7zip && \
-  echo "**** install unrar from source ****" && \
-  mkdir /tmp/unrar && \
-  curl -o \
-    /tmp/unrar.tar.gz -L \
-    "https://www.rarlab.com/rar/unrarsrc-${UNRAR_VERSION}.tar.gz" && \
-  tar xf \
-    /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  install -v -m755 unrar /usr/local/bin && \
+  if [ -z ${DELUGE_VERSION+x} ]; then \
+    DELUGE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:deluge$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
   apk add -U --upgrade --no-cache \
-    deluge && \  
-  echo "**** install python packages ****" && \
-  python3 -m ensurepip && \
-  pip3 install -U --no-cache-dir \
-    pip \
-    wheel && \
-  pip3 install --no-cache-dir \
-    future \
-    requests && \
+    deluge==${DELUGE_VERSION} && \
   echo "**** grab GeoIP database ****" && \
-  curl -o \
-    /usr/share/GeoIP/GeoIP.dat -L --retry 10 --retry-max-time 60 --retry-all-errors \
-    "https://infura-ipfs.io/ipfs/QmWTWcPRRbADZcLcJeANZmcJZNrcpmuQgKYBi6hGdddtC6" && \
-  #Download Filebot
-  mkdir /tmp/filebot && \
-  curl -# -L -f ${FILEBOT_URL} | tar xz -C /tmp/filebot && \
-  mkdir -p /opt/filebot/data && \
-  mkdir -p /opt/filebot/lib/x86_64/ && \
-  cp /tmp/filebot/lib/x86_64/libjnidispatch.so /opt/filebot/lib/x86_64/ && \
-  cp /tmp/filebot/filebot.sh /opt/filebot/ && \
-  cp /tmp/filebot/FileBot.jar /opt/filebot/ && \
-  chmod 777 -R /opt/filebot/data && \
-  ln -s /opt/filebot/filebot.sh /usr/bin/filebot && \
-  # Dependencies
-  apk add --no-cache --upgrade \
-    openjdk16-jre \
-    libmediainfo \
-    && \
+  curl -L --retry 10 --retry-max-time 60 --retry-all-errors \
+    "https://mailfud.org/geoip-legacy/GeoIP.dat.gz" \
+    | gunzip > /usr/share/GeoIP/GeoIP.dat && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
@@ -76,6 +51,9 @@ RUN \
 # add local files
 COPY root/ /
 
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
 # ports and volumes
 EXPOSE 8112 58846 58946 58946/udp
 VOLUME /config

Dockerfile.aarch64

@@ -0,0 +1,56 @@
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+ARG DELUGE_VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="aptalca"
+
+# environment variables
+ENV PYTHON_EGG_CACHE="/config/plugins/.python-eggs" \
+  TMPDIR=/run/deluged-temp
+
+# install software
+RUN \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --upgrade --virtual=build-dependencies \
+    build-base && \
+  echo "**** install packages ****" && \
+  apk add --no-cache --upgrade --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    python3 \
+    py3-future \
+    py3-geoip \
+    py3-requests \
+    p7zip && \
+  if [ -z ${DELUGE_VERSION+x} ]; then \
+    DELUGE_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    && awk '/^P:deluge$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
+  fi && \
+  apk add -U --upgrade --no-cache \
+    deluge==${DELUGE_VERSION} && \
+  echo "**** grab GeoIP database ****" && \
+  curl -L --retry 10 --retry-max-time 60 --retry-all-errors \
+    "https://mailfud.org/geoip-legacy/GeoIP.dat.gz" \
+    | gunzip > /usr/share/GeoIP/GeoIP.dat && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
+  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
+  rm -rf \
+    $HOME/.cache \
+    /tmp/*
+
+# add local files
+COPY root/ /
+
+# add unrar
+COPY --from=unrar /usr/bin/unrar-alpine /usr/bin/unrar
+
+# ports and volumes
+EXPOSE 8112 58846 58946 58946/udp
+VOLUME /config