change linking of config in worker mode

Reviewed-on: #7

Dockerfile

@@ -23,7 +23,7 @@ ENV TZ=UTC
 ENV LOG_LEVEL=9
 
 #Get required packages
-RUN apk update && apk add --no-cache tzdata curl shadow bash xz git procps nodejs npm nano openssl ca-certificates
+RUN apk update && apk add tzdata curl shadow bash xz git procps nodejs npm nano openssl
 
 #Make folders
 RUN mkdir /config && \
@@ -39,18 +39,13 @@ RUN curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/
     curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz" | tar Jpxf - -C /
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 S6_VERBOSITY=1
 
-#Install Cronicle & tidy up things I don't want
-RUN apk add --no-cache --virtual .jq jq && \
-    mkdir /app/cronicle && \
+#Install Cronicle
+RUN mkdir /app/cronicle && \
     cd /app/cronicle && \
     wget https://github.com/cronicle-edge/cronicle-edge/archive/refs/tags/v${CRONICLE_EDGE_VERSION}.tar.gz && \
     tar -xf v${CRONICLE_EDGE_VERSION}.tar.gz --strip-components 1 && \
     rm -rf Docker* .gitignore Readme.md .vscode sample_conf/examples/backup sample_conf/examples/docker.sh && \
-    jq 'del(.storage[] | select(contains(["global/conf_keys"])))' sample_conf/setup.json >> sample_conf/setup-new.json && \
-    rm sample_conf/setup.json && \
-    mv sample_conf/setup-new.json sample_conf/setup.json && \
-    rm -rf v${CRONICLE_EDGE_VERSION}.tar.gz && \
-    apk del .jq
+    rm -rf v${CRONICLE_EDGE_VERSION}.tar.gz
 
 WORKDIR /app/cronicle
 RUN npm install && \

README.md

@@ -92,8 +92,6 @@ services:
 
 This container automatically checks for scripts in `/config/init` and runs them at startup. This could be useful if you need to install additional applications into a worker container so it can execute jobs.
 
-Note that any scripts will be run as `root` before permissions are altered in `/app` and `/config`. Anything that an init script does in either of these folders will be owned by `cronicle` when the container continues.
-
 ## Reverse Proxying
 
 For a single manager behind a reverse proxy, you may need to specify a specific route for the web-socket connections.

root/container-init.sh

@@ -39,31 +39,16 @@ else
     exit 1
 fi
 
-#Importing and running additional scripts placed in /config/init
-if [ -d /config/init ]; then
-	if [ "$(ls -A /config/init)" ]; then
-        echo "Running additional startup scripts."
-        for f in /config/init/*.sh; do
-            bash "$f" 
-        done
-    else
-        echo "/config/init is empty - no additional startup scripts detected."
-    fi
-else
-	echo "Directory /config/init not found. Creating."
-    mkdir /config/init && chown -R cronicle:cronicle /config/init
-fi
-
 echo "Checking permissions in /config and /app."
 
-if [ -n "$(find /app \! -user ${PUID})" ] || [ -n "$(find /app \! -group ${PGID})" ]
+if [ ! "$(stat -c %u /app)" -eq "${PUID}" ] || [ ! "$(stat -c %g /app)" -eq "${PGID}" ]
 then
     echo "Fixing permissions for /app (this can take some time)."
-    chown -R cronicle:cronicle /app || true
+    chown -R cronicle:cronicle /app
 fi
 
-if [ -n "$(find /config \! -user ${PUID})" ] || [ -n "$(find /config \! -group ${PGID})" ]
+if [ ! "$(stat -c %u /config)" -eq "${PUID}" ] || [ ! "$(stat -c %g /config)" -eq "${PGID}" ]
 then
     echo "Fixing permissions for /config (this can take some time)."
-    chown -R cronicle:cronicle /config || true
+    chown -R cronicle:cronicle /config
 fi

root/cronicle-prepare.sh

@@ -3,6 +3,29 @@
 
 echo "Preparing Cronicle"
 
+#Importing and running additional scripts placed in /config/init
+if [ -d /config/init ]
+then
+	if [ "$(ls -A /config/init)" ]
+    then
+
+        echo "Running additional startup scripts."
+
+        bash /config/init/*
+	
+    else
+        
+        echo "/config/init is empty - no additional startup scripts detected."
+	
+    fi
+else
+
+	echo "Directory /config/init not found. Creating."
+
+    mkdir /config/init
+
+fi
+
 if [ ! -d /config/cronicle ]
 then
 
@@ -80,8 +103,10 @@ then
     then
 
         echo "No config found. Copy config.json from the manager server and place it in /config/cronicle/conf dir."
-        cp -R /app/cronicle/conf /config/cronicle/conf
+        cp -r /app/cronicle/conf /config/cronicle/conf
         rm -rf /config/cronicle/conf/config.json
+        rm -rf /app/cronicle/conf
+        ln -s /config/cronicle/conf /app/cronicle/conf
         echo ''
         echo ''
         echo '*************************************'