From 4a2673c99248b8c6e1a4ffe888a0ffa64be3a9f9 Mon Sep 17 00:00:00 2001
From: MrTyton <MrTyton@users.noreply.github.com>
Date: Tue, 28 May 2024 21:35:58 -0400
Subject: [PATCH] Try s6 again

---
 Dockerfile                  | 25 +++++++++++++------------
 release-versions/latest.txt |  2 +-
 root/app/run.sh             |  2 +-
 root/app/url_ingester.py    |  1 +
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 94d5a2b..05a0ab2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,14 +51,14 @@ RUN echo "*** Install FFF ***" && \
         python3 -m pip --no-cache-dir install --extra-index-url https://testpypi.python.org/pypi FanFicFare==${FFF_RELEASE}; \
     fi
 	
-#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
-#RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
-#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
-#RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
-#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
-#RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz 
-#ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp
-#RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz 
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp
+RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz
 
 RUN echo "**** cleanup ****" && \
  rm -rf \
@@ -68,8 +68,9 @@ RUN echo "**** cleanup ****" && \
 
 COPY root/ /
 
-#RUN chmod -R +777 /etc/cont-init.d/
-#RUN chmod -R +777 /etc/s6-overlay/
+RUN chmod -R +777 /etc/cont-init.d/
+RUN chmod -R +777 /etc/s6-overlay/
+RUN chmod -R +777 /app/
 
 # Temporary Workaround
 
@@ -77,5 +78,5 @@ VOLUME /config
 
 WORKDIR /config
 
-#ENTRYPOINT ["/init"]
-CMD python /app/fanficdownload.py --config="/config/config.toml"
+ENTRYPOINT ["/init"]
+#CMD python -u /app/fanficdownload.py --config="/config/config.toml"
diff --git a/release-versions/latest.txt b/release-versions/latest.txt
index 0f7371e..5120ecb 100644
--- a/release-versions/latest.txt
+++ b/release-versions/latest.txt
@@ -1 +1 @@
-2024.05.28-1
\ No newline at end of file
+2024.05.28-2
\ No newline at end of file
diff --git a/root/app/run.sh b/root/app/run.sh
index b24f279..4fe5cbd 100644
--- a/root/app/run.sh
+++ b/root/app/run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python /app/fanficdownload.py --config="/config/config.toml"
\ No newline at end of file
+python -u /app/fanficdownload.py --config="/config/config.toml"
\ No newline at end of file
diff --git a/root/app/url_ingester.py b/root/app/url_ingester.py
index 55e105b..5812ae5 100644
--- a/root/app/url_ingester.py
+++ b/root/app/url_ingester.py
@@ -69,6 +69,7 @@ def get_urls(self) -> set[str]:
             except Exception as e:
                 logging.disable(old_level)
                 ff_logging.log_failure(f"Failed to get URLs: {e}")
+        # Restore the old logging level
         logging.disable(old_level)
         return urls