From 6fff39cc22d726dcd392d77a82e0a099799fc786 Mon Sep 17 00:00:00 2001
From: Jesse Bannon <jbann1994@gmail.com>
Date: Sat, 27 Sep 2025 14:08:44 -0700
Subject: [PATCH] [DOCKER] Include Deno in Docker images

---
 docker/Dockerfile                       | 4 +++-
 docker/Dockerfile.gui                   | 3 +++
 docker/Dockerfile.ubuntu                | 3 +++
 docker/root/custom-cont-init.d/defaults | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f50d68dc..7232b5e6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,6 +18,7 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \
       vim \
       g++ \
       nano \
+      unzip \
       make \
       libffi-dev \
       "python3>=3.10" \
@@ -43,7 +44,8 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \
       phantomjs --version && \
       cd -; \
     fi && \
-    echo "hi" && \
+    # Install Deno, required for YouTube downloads
+    curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh -s -- -y --no-modify-path && \
     # Install ytdl-sub, ensure it is installed properly
     python3 -m pip install --break-system-packages --no-cache-dir ytdl_sub-*.whl && \
       ytdl-sub -h && \
diff --git a/docker/Dockerfile.gui b/docker/Dockerfile.gui
index 892fd569..101124c0 100644
--- a/docker/Dockerfile.gui
+++ b/docker/Dockerfile.gui
@@ -23,6 +23,7 @@ RUN mkdir -p /config && \
       vim \
       g++ \
       nano \
+      unzip \
       make \
       python3-pip \
       fontconfig \
@@ -61,6 +62,8 @@ RUN mkdir -p /config && \
       echo "Phantom JS version:" && \
       phantomjs --version ; \
     fi && \
+    # Install Deno, required for YouTube downloads
+    curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh -s -- -y --no-modify-path && \
     # Install ytdl-sub, ensure it is installed properly
     pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \
       ytdl-sub -h && \
diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index 37240dd4..e77d00a6 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -26,6 +26,7 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \
       vim \
       g++ \
       nano \
+      unzip \
       make \
       python3-pip \
       fontconfig \
@@ -64,6 +65,8 @@ RUN mkdir -pv "${DEFAULT_WORKSPACE}" && \
       echo "Phantom JS version:" && \
       phantomjs --version ; \
     fi && \
+    # Install Deno, required for YouTube downloads
+    curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh -s -- -y --no-modify-path && \
     # Install ytdl-sub, ensure it is installed properly
     pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \
       ytdl-sub -h && \
diff --git a/docker/root/custom-cont-init.d/defaults b/docker/root/custom-cont-init.d/defaults
index cfbc0776..4080f8f5 100644
--- a/docker/root/custom-cont-init.d/defaults
+++ b/docker/root/custom-cont-init.d/defaults
@@ -33,7 +33,7 @@ if [ "$CRON_SCHEDULE" != "" ] ; then
     echo '#!/bin/bash' > "$CRON_WRAPPER_SCRIPT"
     echo "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" >> "$CRON_WRAPPER_SCRIPT"
     echo "cd \"$DEFAULT_WORKSPACE\"" >> "$CRON_WRAPPER_SCRIPT"
-    echo ". \"$CRON_SCRIPT\" | tee -a \"$LOGS_TO_STDOUT\"" >> "$CRON_WRAPPER_SCRIPT"
+    echo ". \"$CRON_SCRIPT\" >> \"$LOGS_TO_STDOUT\" 2>&1" >> "$CRON_WRAPPER_SCRIPT"
     chmod +x "$CRON_WRAPPER_SCRIPT"
     chown abc:abc "$CRON_WRAPPER_SCRIPT"