typo correction on readme [CI SKIP]

Reviewed-on: #4

.drone.yml

@@ -22,6 +22,8 @@ steps:
   when:
     ref:
       - refs/tags/**
+  depends_on:
+    - clone
 
   # Set tags for main branch
 - name: make-tags
@@ -31,6 +33,9 @@ steps:
   when:
     ref:
       - refs/heads/main
+  depends_on:
+    - get-tags
+    - clone
 
 - name: make-tags-release
   image: node
@@ -39,9 +44,12 @@ steps:
   when:
     ref:
       - refs/tags/**
+  depends_on:
+    - get-tags
+    - clone
 
   # Build containers from main branch
-- name: build
+- name: build-gitea
   image: thegeeklab/drone-docker-buildx
   privileged: true
   settings:
@@ -55,17 +63,53 @@ steps:
     platforms:
       - linux/arm64
       - linux/amd64
+  depends_on:
+    - make-tags
+    - make-tags-release
 
-- name: release
+- name: build-github
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
+  settings:
+    provenance: false
+    registry: ghcr.io
+    username: 
+      from_secret: docker_username
+    password: 
+      from_secret: github_token
+    repo: ghcr.io/mrmeeb/cronicle
+    platforms:
+      - linux/arm64
+      - linux/amd64
+  depends_on:
+    - make-tags
+    - make-tags-release
+
+- name: release-gitea
   image: goreleaser/goreleaser
   environment:
     GITEA_TOKEN:
       from_secret: gitea_token
   commands:
-    - goreleaser release
+    - goreleaser release -f .goreleaser-gitea.yaml
   when:
     ref:
       - refs/tags/**
+  depends_on:
+    - build-gitea
+
+- name: release-github
+  image: goreleaser/goreleaser
+  environment:
+    GITHUB_TOKEN:
+      from_secret: github_token
+  commands:
+    - goreleaser release -f .goreleaser-github.yaml
+  when:
+    ref:
+      - refs/tags/**
+  depends_on:
+    - build-github
 
 - name: notify
   image: plugins/slack
@@ -76,6 +120,11 @@ steps:
   settings:
     webhook: 
       from_secret: slack_webhook
+  depends_on:
+    - release-gitea
+    - release-github
+    - build-github
+    - build-gitea
 
 ---
 kind: pipeline
@@ -100,7 +149,7 @@ steps:
     - echo -n "develop-${DRONE_COMMIT_SHA:0:8}, develop" > .tags
    
   # Build containers from develop branch
-- name: build
+- name: build-gitea
   image: thegeeklab/drone-docker-buildx
   privileged: true
   settings:
@@ -114,6 +163,25 @@ steps:
     platforms:
       - linux/arm64
       - linux/amd64
+  depends_on:
+    - make-tags
+
+- name: build-github
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
+  settings:
+    provenance: false
+    registry: ghcr.io
+    username: 
+      from_secret: docker_username
+    password: 
+      from_secret: github_token
+    repo: ghcr.io/mrmeeb/cronicle
+    platforms:
+      - linux/arm64
+      - linux/amd64
+  depends_on:
+    - make-tags
 
 - name: notify
   image: plugins/slack
@@ -124,3 +192,6 @@ steps:
   settings:
     webhook: 
       from_secret: slack_webhook
+  depends_on:
+    - build-gitea
+    - build-github

.gitignore

@@ -1,2 +1,3 @@
-dist/
+dist-gitea/
+dist-github/
 .tags

.goreleaser-gitea.yaml

@@ -1,3 +1,5 @@
+dist: dist-gitea
+
 build:
   skip: true
 

.goreleaser-github.yaml

@@ -0,0 +1,20 @@
+dist: dist-github
+
+build:
+  skip: true
+
+archives:
+- format: binary
+
+release:
+  draft: true
+  github:
+    owner: MrMeeb
+    name: cronicle-docker
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'

Dockerfile

@@ -1,46 +1,60 @@
-FROM alpine:latest
+FROM alpine:latest as base
+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
+ARG CRONICLE_EDGE_VERSION=1.6.2
 
 ENV CRONICLE_foreground=1
 ENV CRONICLE_echo=1
 ENV CRONICLE_color=1
-ENV EDITOR=vi
+ENV EDITOR=nano
 ENV MODE=manager
 ENV PUID=1000
 ENV PGID=1000
 ENV TZ=UTC
+ENV LOG_LEVEL=9
 
 #Get required packages
-RUN apk update && apk add tzdata curl shadow bash xz git procps nodejs npm
+RUN apk update && apk add tzdata curl shadow bash xz git procps nodejs npm nano
 
 #Make folders
 RUN mkdir /config && \
     mkdir /app && \
 #Create default user
-    useradd -u 1000 -U -d /config -s /bin/false mrmeeb && \
-    usermod -G users mrmeeb
+    useradd -u 1000 -U -d /config -s /bin/false cronicle && \
+    usermod -G users cronicle
 
 #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-x86_64.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-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
 
 #Install Cronicle
-RUN git clone https://github.com/cronicle-edge/cronicle-edge.git /app/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 && \
+    rm -rf v${CRONICLE_EDGE_VERSION}.tar.gz
+
 WORKDIR /app/cronicle
 RUN npm install && \
     node bin/build dist
-RUN rm -rf /app/cronicle/Docker* .vscode
-
-#Create Cronicle user, necessary for SSH plugin with default settings
-RUN adduser --disabled-password --no-create-home cronicle
 
 COPY root/ /
 RUN chmod +x /cronicle-prepare.sh && \
-    chmod +x /container-init.sh
+    chmod +x /container-init.sh && \
+    chown -R ${PUID}:${PGID} /app /config
 
 EXPOSE 3012
 

README.md

@@ -1,10 +1,41 @@
 # Cronicle Docker
 
-![Drone (self-hosted) with branch](https://img.shields.io/drone/build/MrMeeb/cronicle-docker/main?label=main&server=https%3A%2F%2Fdrone.mrmeeb.stream&style=for-the-badge) ![Drone (self-hosted) with branch](https://img.shields.io/drone/build/MrMeeb/cronicle-docker/develop?label=develop&server=https%3A%2F%2Fdrone.mrmeeb.stream&style=for-the-badge)
+![Drone (self-hosted) with branch](https://img.shields.io/drone/build/MrMeeb/cronicle-docker/main?label=latest&server=https%3A%2F%2Fdrone.mrmeeb.stream&style=for-the-badge) ![Drone (self-hosted) with branch](https://img.shields.io/drone/build/MrMeeb/cronicle-docker/develop?label=develop&server=https%3A%2F%2Fdrone.mrmeeb.stream&style=for-the-badge)
 
-Dockerised Cronicle, based on the [Cronicle-Edge](https://github.com/cronicle-edge/cronicle-edge) fork.
+Dockerised Cronicle, based on the [Cronicle-Edge](https://github.com/cronicle-edge/cronicle-edge) fork of [Cronicle](https://github.com/jhuckaby/Cronicle). This container was built to include features I value in containers, namely logging to `stdout` and configurable `PUID` and `PGID`.
 
-Can function in both the **manager** and **worker** role.
+This container can function in both the **manager** and **worker** role.
+
+## Links
+- :tea: [Gitea Repo (source)](https://git.mrmeeb.stream/MrMeeb/cronicle-docker)
+- :whale2: [Containers](https://git.mrmeeb.stream/MrMeeb/-/packages/container/cronicle/latest) (also published to GHCR)
+- :mirror: [GitHub mirror](https://github.com/MrMeeb/cronicle-docker)
+- :package: [Cronicle Repo](https://github.com/jhuckaby/Cronicle)
+- :package: [Cronicle-Edge Repo](https://github.com/cronicle-edge/cronicle-edge)
+
+*This repo is mirrored to GitHub*
+
+## Overview
+
+[**Cronicle**](https://github.com/jhuckaby/Cronicle) is a multi-server task scheduler and runner, with a web based front-end UI.  It handles both scheduled, repeating and on-demand jobs, targeting any number of worker servers, with real-time stats and live log viewer.  It's basically a fancy [Cron](https://en.wikipedia.org/wiki/Cron) replacement written in [Node.js](https://nodejs.org/).  You can give it simple shell commands, or write Plugins in virtually any language.
+
+![Main Screenshot](https://pixlcore.com/software/cronicle/screenshots-new/job-details-complete.png)
+
+## Features at a Glance
+
+* Single or multi-server setup.
+* Automated failover to backup servers.
+* Auto-discovery of nearby servers.
+* Real-time job status with live log viewer.
+* Plugins can be written in any language.
+* Schedule events in multiple timezones.
+* Optionally queue up long-running events.
+* Track CPU and memory usage for each job.
+* Historical stats with performance graphs.
+* Simple JSON messaging system for Plugins.
+* Web hooks for external notification systems.
+* Simple REST API for scheduling and running events.
+* API Keys for authenticating remote apps.
 
 ## Tags
 
@@ -19,9 +50,9 @@ Tags relating to releases are also available, for locking in on a specific versi
 
 `config.json`, located in `/config/cronicle/conf/config.json`, is automatically generated on the first run of Cronicle in 'manager' mode. This file must be kept identical between the manager and any workers it controls.
 
-If you want to configure Cronicle before first run (e.g to use a different storage engine), download `config_sample.json` and adjust accordingly before placing in `/config/cronicle/conf/config.json`.
+If you want to configure Cronicle before first run (e.g to use a different storage engine), download `config_sample.json` and adjust accordingly before placing in `/config/cronicle/conf/config.json`. Make sure to change the `secret`!
 
-:exclamation: NOTE: You must define the hostname of the container. Cronicle expects the hostname to remain the same, so the randomly-generated container hostname can cause problems if it changes. :exclamation:
+:exclamation: You must define the hostname of the container. Cronicle expects the hostname to remain the same, so the randomly-generated container hostname can cause problems if it changes. :exclamation:
 
 ### Docker CLI
 ```
@@ -80,3 +111,4 @@ This container automatically checks for scripts in `/config/init` and runs them
 |PUID    |int    |1000   |Sets the UID of the user Cronicle runs under
 |PGID    |int    |1000   |Sets the GID of the user Cronicle runs under
 |TZ      |[List of valid TZs](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List)    |UTC    |Sets the timezone of the container and by extension Cronicle
+|LOG_LEVEL|1-10  |9      |Sets log level from `1` (quietest) to `10` (loudest)|

root/container-init.sh

@@ -21,6 +21,7 @@ PUID=${PUID}
 PGID=${PGID}
 TZ=${TZ}
 MODE=${MODE}
+LOG_LEVEL=${LOG_LEVEL}
 ----------------------------------------------------------------------
 "
 
@@ -28,26 +29,26 @@ MODE=${MODE}
 if [[ ! "${PUID}" -eq 0 ]] && [[ ! "${PGID}" -eq 0 ]]; then
     echo "Executing usermod..."
     mkdir "/tmp/temphome"
-    usermod -d "/tmp/temphome" mrmeeb
-    usermod -o -u "${PUID}" mrmeeb
-    usermod -d /config mrmeeb
+    usermod -d "/tmp/temphome" cronicle
+    usermod -o -u "${PUID}" cronicle
+    usermod -d /config cronicle
     rm -rf "/tmp/temphome"
-    groupmod -o -g "${PGID}" mrmeeb
+    groupmod -o -g "${PGID}" cronicle
 else
     echo "Running as root is not supported, please fix your PUID and PGID!"
     exit 1
 fi
 
-echo "Checking permissions in /config and /app (this can take some time)."
+echo "Checking permissions in /config and /app."
 
 if [ ! "$(stat -c %u /app)" -eq "${PUID}" ] || [ ! "$(stat -c %g /app)" -eq "${PGID}" ]
 then
-    echo "Fixing permissions for /app."
-    chown -R mrmeeb:mrmeeb /app
+    echo "Fixing permissions for /app (this can take some time)."
+    chown -R cronicle:cronicle /app
 fi
 
 if [ ! "$(stat -c %u /config)" -eq "${PUID}" ] || [ ! "$(stat -c %g /config)" -eq "${PGID}" ]
 then
-    echo "Fixing permissions for /config."
-    chown -R mrmeeb:mrmeeb /config
+    echo "Fixing permissions for /config (this can take some time)."
+    chown -R cronicle:cronicle /config
 fi

root/cronicle-prepare.sh

@@ -42,9 +42,19 @@ 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 ]
@@ -60,8 +70,6 @@ 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."
@@ -69,8 +77,6 @@ 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" ] 
@@ -89,9 +95,7 @@ then
 
         #Removing default config.json and linking provided one back into Cronicle
         rm -rf /app/cronicle/conf/config.json
-        ln -s /config/config.json /app/cronicle/conf/config.json
-
-        #exec node /app/cronicle/lib/main.js --color 1
+        ln -s /config/cronicle/conf/config.json /app/cronicle/conf/config.json
 
     fi
 
@@ -101,7 +105,20 @@ else
 
 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
+#Expose log directory
+if [ ! -d /config/cronicle/logs ]
+then
+
+    echo "Logs dir is missing, creating."
+
+    cp -r /app/cronicle/logs /config/cronicle/logs
+    rm -rf /app/cronicle/logs
+    ln -s /config/cronicle/logs /app/cronicle/logs
+else
+
+    echo "Logs dir already exists. Doesn't need creating."
+    echo "Linking persistent logs dir back into Cronicle."
+    rm -rf /app/cronicle/logs
+    ln -s /config/cronicle/logs /app/cronicle/logs
+
+fi

root/etc/s6-overlay/s6-rc.d/cronicle-prepare/up

@@ -1 +1 @@
-exec s6-setuidgid mrmeeb /cronicle-prepare.sh
+exec s6-setuidgid cronicle /cronicle-prepare.sh

root/etc/s6-overlay/s6-rc.d/cronicle/run

@@ -1,3 +1,3 @@
 #!/command/with-contenv bash
 # shellcheck shell=bash
-exec s6-setuidgid mrmeeb node /app/cronicle/lib/main.js --color 1
+exec s6-setuidgid cronicle node /app/cronicle/lib/main.js --debug_level ${LOG_LEVEL} --color ${CRONICLE_color}