docker changes

docker/Dockerfile

@@ -61,6 +61,8 @@ HOME="/config" \
 DOCKER_MODS=linuxserver/mods:universal-stdout-logs|linuxserver/mods:universal-cron \
 DEFAULT_WORKSPACE=/config \
 CRON_SCRIPT="/config/cron" \
-LOGS_TO_STDOUT=/config/.cron.log
+CRON_WRAPPER_SCRIPT="/config/.cron_wrapper" \
+LOGS_TO_STDOUT=/config/.cron.log \
+LSIO_FIRST_PARTY=false
 
 VOLUME /config

docker/Dockerfile.gui

@@ -84,6 +84,8 @@ HOME="/config" \
 DOCKER_MODS=linuxserver/mods:universal-stdout-logs|linuxserver/mods:universal-cron \
 DEFAULT_WORKSPACE=/config/ytdl-sub-configs \
 CRON_SCRIPT="/config/ytdl-sub-configs/cron" \
-LOGS_TO_STDOUT=/config/ytdl-sub-configs/.cron.log
+CRON_WRAPPER_SCRIPT="/config/ytdl-sub-configs/.cron_wrapper" \
+LOGS_TO_STDOUT=/config/ytdl-sub-configs/.cron.log \
+LSIO_FIRST_PARTY=false
 
 VOLUME /config

docker/Dockerfile.ubuntu

@@ -87,6 +87,8 @@ HOME="/config" \
 DOCKER_MODS=linuxserver/mods:universal-stdout-logs|linuxserver/mods:universal-cron \
 DEFAULT_WORKSPACE=/config \
 CRON_SCRIPT="/config/cron" \
-LOGS_TO_STDOUT=/config/.cron.log
+CRON_WRAPPER_SCRIPT="/config/.cron_wrapper" \
+LOGS_TO_STDOUT=/config/.cron.log \
+LSIO_FIRST_PARTY=false
 
 VOLUME /config

docker/root/custom-cont-init.d/defaults

@@ -11,7 +11,10 @@ echo "Starting ytdl-sub..."
     cp /defaults/subscriptions.yaml "$DEFAULT_WORKSPACE/subscriptions.yaml"
 [[ ! -d "$DEFAULT_WORKSPACE/examples" ]] && \
     mkdir -p "$DEFAULT_WORKSPACE/examples" && \
-    cp /defaults/examples/* "$DEFAULT_WORKSPACE/examples"
+    cp -r /defaults/examples/* "$DEFAULT_WORKSPACE/examples"
+
+# always create cron log file
+touch "$LOGS_TO_STDOUT"
 
 # permissions
 chown -R ${PUID:-abc}:${PGID:-abc} \
@@ -24,9 +27,17 @@ if [ "$CRON_SCHEDULE" != "" ] ; then
 
     cp /defaults/cron_wrapper "$DEFAULT_WORKSPACE/.cron_wrapper"
 
+    CRON_SCHEDULE_CLEAN="${CRON_SCHEDULE//\"/}"
+    CRON_SCHEDULE_CLEAN="${CRON_SCHEDULE_CLEAN//\'/}"
+
     echo "# min   hour    day     month   weekday command" > /config/crontabs/abc
-    echo "$CRON_SCHEDULE   $DEFAULT_WORKSPACE/.cron_wrapper" >> /config/crontabs/abc
+    echo "$CRON_SCHEDULE_CLEAN   $DEFAULT_WORKSPACE/.cron_wrapper" >> /config/crontabs/abc
 
     chmod +x "$CRON_SCRIPT"
     chown abc:abc "$CRON_SCRIPT"
+
+    crontab -u abc /config/crontabs/abc
+else
+  echo "CRON_SCHEDULE not specified, disabling cron."
+  echo "# min   hour    day     month   weekday command" > /config/crontabs/abc
 fi

docker/root/defaults/cron_wrapper

@@ -1,4 +1,5 @@
 #!/bin/bash
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
+cd "$DEFAULT_WORKSPACE"
 . "$CRON_SCRIPT" | tee "$LOGS_TO_STDOUT"

docker/root/etc/s6-overlay/s6-rc.d/init-adduser/test.txt

@@ -0,0 +1 @@
+hi