From 815ca55d1f6d5a98c89ccb7dbbdd30d5e9de2215 Mon Sep 17 00:00:00 2001
From: MrTyton <MrTyton@users.noreply.github.com>
Date: Fri, 25 Mar 2022 23:27:34 -0400
Subject: [PATCH] Try the linuxserver image?

---
 Dockerfile                                    | 70 ++++---------------
 release-versions/latest.txt                   |  2 +-
 .../{99-init.d-finish => 98-init.d-finish}    |  0
 3 files changed, 16 insertions(+), 56 deletions(-)
 rename root/etc/cont-init.d/{99-init.d-finish => 98-init.d-finish} (100%)

diff --git a/Dockerfile b/Dockerfile
index eb9366b..b5b9b46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-alpine
+FROM lscr.io/linuxserver/calibre:latest
 
 # set version label
 ARG VERSION
@@ -7,7 +7,8 @@ ARG FFF_RELEASE
 LABEL build_version="FFDL-Auto version:- ${VERSION} Calibre: ${CALIBRE_RELEASE} FFF: ${FFF_RELEASE}"
 
 ENV PUID="911" \
-    PGID="911"
+    PGID="911" \
+	GUIAUTOSTART="false"
 
 RUN set -x && \
     apk update && \
@@ -23,69 +24,28 @@ RUN set -x && \
     curl \
     dbus \
 	jq \
-	python3 \
+	python3.9 \
 	shadow
 	
-RUN set -x && \
-    addgroup --gid "$PGID" abc && \
-    adduser \
-        --gecos "" \
-        --disabled-password \
-        --no-create-home \
-        --uid "$PUID" \
-        --ingroup abc \
-        --shell /bin/bash \
-        abc 
-		
-RUN echo "**** install calibre ****" && \
-  mkdir -p \
-    /opt/calibre && \
-  if [ -z ${CALIBRE_RELEASE+x} ]; then \
-    CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
-    | jq -r .tag_name); \
-  fi && \
-  CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \
-  CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \
-  curl -o \
-    /tmp/calibre-tarball.txz -L \
-    "$CALIBRE_URL" && \
-  tar xvf /tmp/calibre-tarball.txz -C \
-    /opt/calibre && \
-  /opt/calibre/calibre_postinstall && \
-  dbus-uuidgen > /etc/machine-id
- 
-RUN echo "**** cleanup ****" && \
- rm -rf \
-	/tmp/* \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
-	
-RUN echo "**** s6 omsta;; ****" && \
-	set -ex && \
-    ARCH=`uname -m` && \
-    if [ "$ARCH" = "x86_64" ]; then \
-        s6_package="s6-overlay-amd64.tar.gz" ; \
-    elif [ "$ARCH" = "aarch64" ]; then \
-        s6_package="s6-overlay-aarch64.tar.gz" ; \
-    else \
-        echo "unknown arch: ${ARCH}" && \
-        exit 1 ; \
-    fi && \
-    wget -P /tmp/ https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/${s6_package} && \
-    tar -xzf /tmp/${s6_package} -C / && \
-    rm -rf /tmp/*
 
 RUN echo *** Install Packages *** && \
 	set -x && \
-	apk add --no-cache --upgrade py-pillow && \
+	apt-get install --upgrade py-pillow && \
     if [ -z ${FFF_RELEASE+x} ]; then \
-        python3 -m pip --no-cache-dir install FanFicFare; \
+        python3.9 -m pip --no-cache-dir install FanFicFare; \
     else \
-        python3 -m pip --no-cache-dir install --extra-index-url https://testpypi.python.org/pypi FanFicFare==${FFF_RELEASE}; \
+        python3.9 -m pip --no-cache-dir install --extra-index-url https://testpypi.python.org/pypi FanFicFare==${FFF_RELEASE}; \
     fi && \
-	python3 -m pip --no-cache-dir install pushbullet.py && \
+	python3.9 -m pip --no-cache-dir install pushbullet.py && \
     ln -s /opt/calibre/calibredb /bin/calibredb
 
+RUN echo "**** cleanup ****" && \
+ apt-get clean && \
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
+
 COPY root/ /
 
 VOLUME /config
diff --git a/release-versions/latest.txt b/release-versions/latest.txt
index a684006..f3ae7a1 100644
--- a/release-versions/latest.txt
+++ b/release-versions/latest.txt
@@ -1 +1 @@
-2022.03.25-26
+2022.03.25-27
diff --git a/root/etc/cont-init.d/99-init.d-finish b/root/etc/cont-init.d/98-init.d-finish
similarity index 100%
rename from root/etc/cont-init.d/99-init.d-finish
rename to root/etc/cont-init.d/98-init.d-finish