From 86222b54d304a75e3fb9233299e5e7e4366d9a3b Mon Sep 17 00:00:00 2001
From: MrTyton <MrTyton@users.noreply.github.com>
Date: Fri, 25 Mar 2022 18:25:00 -0400
Subject: [PATCH] Move off of alpine

---
 .github/workflows/docker-image.yml | 2 +-
 Dockerfile                         | 9 +++++----
 release-versions/latest.txt        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 521d480..f6d07b7 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,4 +1,4 @@
-name: Publish DOcker Image
+name: Publish Docker Image
 
 on:
   workflow_dispatch:
diff --git a/Dockerfile b/Dockerfile
index 70567e8..49d4295 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-alpine
+FROM python:3.9-slim
 
 # set version label
 ARG VERSION
@@ -11,8 +11,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \
     PGID="911"
 
 RUN mkdir -p /opt/calibre && \
-    apk update && \
-    apk add --no-cache --upgrade \
+    apt-get update && \
+    apt-get install --no-cache --upgrade \
     bash \
     ca-certificates \
     gcc \
@@ -51,6 +51,7 @@ RUN echo "**** install calibre ****" && \
 	"$CALIBRE_URL" && \
  tar xvf /tmp/calibre-tarball.txz -C \
 	/opt/calibre && \
+ /opt/calibre/calibre_postinstall && \
  dbus-uuidgen > /etc/machine-id
  
 RUN echo "**** cleanup ****" && \
@@ -61,7 +62,7 @@ RUN echo "**** cleanup ****" && \
 	/var/tmp/*
 
 RUN echo *** Install Packages *** && \
-	apk add --no-cache --upgrade py-pillow && \
+	apt-get install --no-cache --upgrade py-pillow && \
     if [ -z ${FFF_RELEASE+x} ]; then \
         python3 -m pip --no-cache-dir install FanFicFare \
     else \
diff --git a/release-versions/latest.txt b/release-versions/latest.txt
index 39ecfde..8faab66 100644
--- a/release-versions/latest.txt
+++ b/release-versions/latest.txt
@@ -1 +1 @@
-v2022.03.25-5
+v2022.03.25-6