From f61da6d64ac54c1e5ceea6724d561f2243de24c5 Mon Sep 17 00:00:00 2001
From: Jesse Bannon <jbann1994@gmail.com>
Date: Sat, 15 Mar 2025 14:33:01 -0700
Subject: [PATCH] more docker changse

---
 docker/root/custom-cont-init.d/defaults |  8 +++++++-
 docker/root/defaults/cron_wrapper       |  5 -----
 docker/testing/docker-compose.yml       | 26 ++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 7 deletions(-)
 delete mode 100644 docker/root/defaults/cron_wrapper

diff --git a/docker/root/custom-cont-init.d/defaults b/docker/root/custom-cont-init.d/defaults
index 0fb1789f..0a30a9fd 100644
--- a/docker/root/custom-cont-init.d/defaults
+++ b/docker/root/custom-cont-init.d/defaults
@@ -22,10 +22,15 @@ if [ "$CRON_SCHEDULE" != "" ] ; then
     [[ ! -e "$CRON_SCRIPT" ]] && \
     cp /defaults/cron "$CRON_SCRIPT"
 
-    cp /defaults/cron_wrapper "$CRON_WRAPPER_SCRIPT"
+    # create cron script wrapper
+    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"
     chmod +x "$CRON_WRAPPER_SCRIPT"
     chown abc:abc "$CRON_WRAPPER_SCRIPT"
 
+    # Set the crontab file to the schedule, cleanly
     CRON_SCHEDULE_CLEAN="${CRON_SCHEDULE//\"/}"
     CRON_SCHEDULE_CLEAN="${CRON_SCHEDULE_CLEAN//\'/}"
 
@@ -47,6 +52,7 @@ if [ "$CRON_SCHEDULE" != "" ] ; then
       fi
     else
       echo "Error in CRON_SCHEDULE definition, disabling cron."
+      exit 1
     fi
 else
   echo "CRON_SCHEDULE not specified, disabling cron."
diff --git a/docker/root/defaults/cron_wrapper b/docker/root/defaults/cron_wrapper
deleted file mode 100644
index 6dd1c64e..00000000
--- a/docker/root/defaults/cron_wrapper
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-cd "$DEFAULT_WORKSPACE"
-. "$CRON_SCRIPT" | tee -a "$LOGS_TO_STDOUT"
\ No newline at end of file
diff --git a/docker/testing/docker-compose.yml b/docker/testing/docker-compose.yml
index 600362d0..d8e31743 100644
--- a/docker/testing/docker-compose.yml
+++ b/docker/testing/docker-compose.yml
@@ -7,9 +7,33 @@ services:
       - PGID=1000
       - TZ=America/Los_Angeles
       - CRON_SCHEDULE="*/1 * * * *"
-      - CRON_RUN_ON_START=false
+      - CRON_RUN_ON_START=true
     volumes:
       - ./volumes/ytdl-sub-gui:/config
     ports:
       - 8443:8443
     restart: unless-stopped
+  ytdl-sub:
+    image: ytdl-sub:local
+    container_name: ytdl-sub
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Los_Angeles
+      - CRON_SCHEDULE="*/1 * * * *"
+      - CRON_RUN_ON_START=true
+    volumes:
+      - ./volumes/ytdl-sub:/config
+    restart: unless-stopped
+  ytdl-sub-ubuntu:
+    image: ytdl-sub-ubuntu:local
+    container_name: ytdl-sub
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/Los_Angeles
+      - CRON_SCHEDULE="*/1 * * * *"
+      - CRON_RUN_ON_START=true
+    volumes:
+      - ./volumes/ytdl-sub:/config
+    restart: unless-stopped
\ No newline at end of file