Merge pull request '1.0.0' (#1) from develop into main

Reviewed-on: #1

Dockerfile

@@ -1,13 +1,4 @@
-FROM alpine:latest as base
+FROM alpine:latest
-ARG TARGETARCH
-
-FROM base AS base-amd64
-ENV S6_OVERLAY_ARCH=x86_64
-
-FROM base AS base-arm64
-ENV S6_OVERLAY_ARCH=aarch64
-
-FROM base-${TARGETARCH}${TARGETVARIANT}
 
 ARG S6_OVERLAY_VERSION=3.1.5.0
 
@@ -32,7 +23,7 @@ RUN mkdir /config && \
 
 #Install s6-overlay
 RUN curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jpxf - -C / && \
-    curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz" | tar Jpxf - -C / && \
+    curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz" | tar Jpxf - -C / && \
     curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz" | tar Jpxf - -C / && \
     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

root/cronicle-prepare.sh

@@ -42,19 +42,9 @@ then
     #Copying config directory to /config/cronicle/conf if not already there, then linking back into Cronicle
     if [ ! -d /config/cronicle/conf ]
     then
-
-        echo "Config dir is missing, creating."
-
         cp -r /app/cronicle/conf /config/cronicle/conf
         rm -rf /app/cronicle/conf
         ln -s /config/cronicle/conf /app/cronicle/conf
-    else
-
-        echo "Config dir already exists. Doesn't need creating."
-        echo "Linking persistent config dir back into Cronicle."
-        rm -rf /app/cronicle/conf
-        ln -s /config/cronicle/conf /app/cronicle/conf
-
     fi
 
     if [ ! -f /config/cronicle/data/.setup_done ]
@@ -70,6 +60,8 @@ then
         rm -rf /app/cronicle/data
         ln -s /config/cronicle/data /app/cronicle/data
 
+        #exec node /app/cronicle/lib/main.js --color 1
+
     else
 
         echo "Setup already completed."
@@ -77,6 +69,8 @@ then
         rm -rf /app/cronicle/data
         ln -s /config/cronicle/data /app/cronicle/data
 
+        #exec node /app/cronicle/lib/main.js --color 1
+
     fi
 
 elif [ $MODE == "worker" ] 
@@ -95,7 +89,9 @@ then
 
         #Removing default config.json and linking provided one back into Cronicle
         rm -rf /app/cronicle/conf/config.json
-        ln -s /config/cronicle/conf/config.json /app/cronicle/conf/config.json
+        ln -s /config/config.json /app/cronicle/conf/config.json
+
+        #exec node /app/cronicle/lib/main.js --color 1
 
     fi
 
@@ -104,3 +100,8 @@ else
     echo "'$MODE' is not a recognised appion for the MODE environment variable. Accepted appions are 'manager' and 'worker'."
 
 fi
+
+#echo "Applying permissions to /config and /app (this can take a while on first run or after PUID/PGID changes)"
+#chmod "=rwx" /config
+#chown -R mrmeeb:mrmeeb /config
+#chown -R mrmeeb:mrmeeb /app