create cronicle user at build

.drone.yml

@@ -1,38 +1,22 @@
+
 kind: pipeline
 type: docker
-name: build-release-images
+name: build-multiarch-images
-trigger:
-  event:
-    exclude:
-    - pull_request
-  ref:
-    - refs/tags/**
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-
-- name: get-tags
-  image: docker:git
-  commands:
-    - git fetch --tags
-  depends_on:
-    - clone
-
 - name: make-tags
   image: node
   commands:
-    - echo -n "${DRONE_TAG}, latest" > .tags
+    - echo -n "${DRONE_COMMIT_SHA:0:10}, latest" > .tags
-  depends_on:
-    - get-tags
 
-- name: build-gitea
+- name: build  
   image: thegeeklab/drone-docker-buildx
   privileged: true
   settings:
-    provenance: false
     registry: git.mrmeeb.stream
     username: 
       from_secret: docker_username
@@ -42,45 +26,6 @@ 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: release-gitea
-  image: goreleaser/goreleaser
-  environment:
-    GITEA_TOKEN:
-      from_secret: gitea_token
-  commands:
-    - goreleaser release -f .goreleaser-gitea.yaml
-  depends_on:
-    - build-gitea
-
-- name: release-github
-  image: goreleaser/goreleaser
-  environment:
-    GITHUB_TOKEN:
-      from_secret: github_token
-  commands:
-    - goreleaser release -f .goreleaser-github.yaml
-  depends_on:
-    - build-github
 
 - name: notify
   image: plugins/slack
@@ -91,150 +36,10 @@ steps:
   settings:
     webhook: 
       from_secret: slack_webhook
-  depends_on:
-    - release-gitea
-    - release-github
 
----
-kind: pipeline
-type: docker
-name: build-main-images
 trigger:
-  event:
-    exclude:
-    - pull_request
-  ref:
-    - refs/heads/main
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-
-- name: make-tags
-  image: node
-  commands:
-    - echo -n "${DRONE_COMMIT_SHA:0:8}, latest" > .tags
-  when:
-    ref:
-      - refs/heads/main
-  depends_on:
-    - clone
-
-- name: build-gitea
-  image: thegeeklab/drone-docker-buildx
-  privileged: true
-  settings:
-    provenance: false
-    registry: git.mrmeeb.stream
-    username: 
-      from_secret: docker_username
-    password: 
-      from_secret: docker_password
-    repo: git.mrmeeb.stream/mrmeeb/cronicle
-    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
-  when:
-    status:
-    - success
-    - failure
-  settings:
-    webhook: 
-      from_secret: slack_webhook
-  depends_on:
-    - build-github
-    - build-gitea
-
----
-kind: pipeline
-type: docker
-name: build-develop-images
-trigger:
-  event:
-    exclude:
-    - pull_request
   branch:
-    - develop
+    - main
-
+  event:
-platform:
+    exclude:
-  os: linux
+    - pull_request
-  arch: amd64
-
-steps:
-  # Set tags for develop branch - git commit SHA and 'develop'
-- name: make-tags
-  image: node
-  commands:
-    - echo -n "develop-${DRONE_COMMIT_SHA:0:8}, develop" > .tags
-   
-  # Build containers from develop branch
-- name: build-gitea
-  image: thegeeklab/drone-docker-buildx
-  privileged: true
-  settings:
-    provenance: false
-    registry: git.mrmeeb.stream
-    username: 
-      from_secret: docker_username
-    password: 
-      from_secret: docker_password
-    repo: git.mrmeeb.stream/mrmeeb/cronicle
-    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
-  when:
-    status:
-    - success
-    - failure
-  settings:
-    webhook: 
-      from_secret: slack_webhook
-  depends_on:
-    - build-gitea
-    - build-github

.gitignore

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

.goreleaser-gitea.yaml

@@ -1,27 +0,0 @@
-dist: dist-gitea
-
-build:
-  skip: true
-
-archives:
-- format: binary
-
-release:
-  draft: true
-  gitea:
-    owner: MrMeeb
-    name: cronicle-docker
-
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'
-
-# .goreleaser.yaml
-gitea_urls:
-  api: https://git.mrmeeb.stream/api/v1
-  download: https://git.mrmeeb.stream
-  # set to true if you use a self-signed certificate
-  skip_tls_verify: false

.goreleaser-github.yaml

@@ -1,20 +0,0 @@
-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,67 +1,35 @@
-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
-ARG CRONICLE_EDGE_VERSION=.1.6.3
 
 ENV CRONICLE_foreground=1
 ENV CRONICLE_echo=1
 ENV CRONICLE_color=1
-ENV EDITOR=nano
+ENV EDITOR=vi
 ENV MODE=manager
-ENV PUID=1000
-ENV PGID=1000
-ENV TZ=UTC
-ENV LOG_LEVEL=9
 
-#Get required packages
+#RUN apt update && apt install -y tini curl git procps
-RUN apk update && apk add --no-cache tzdata curl shadow bash xz git procps nodejs npm nano openssl ca-certificates
 
-#Make folders
+RUN apk update && apk add bash tini git procps nodejs npm
-RUN mkdir /config && \
-    mkdir /app && \
-#Create default user
-    useradd -u 1000 -U -d /config -s /bin/false cronicle && \
-    usermod -G users cronicle
 
-#Install s6-overlay
+RUN git clone https://github.com/cronicle-edge/cronicle-edge.git /opt/cronicle
-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-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 & tidy up things I don't want
+WORKDIR /opt/cronicle
-RUN apk add --no-cache --virtual .jq jq && \
-    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
 
-WORKDIR /app/cronicle
+RUN npm install
-RUN npm install && \
-    node bin/build dist
 
-COPY root/ /
+RUN node bin/build dist
-RUN chmod +x /cronicle-prepare.sh && \
+
-    chmod +x /container-init.sh && \
+COPY run.sh /
-    chown -R ${PUID}:${PGID} /app /config
+
+RUN chmod +x /run.sh
+
+RUN mkdir /config
+
+RUN adduser --disabled-password --no-create-home cronicle
+
+#RUN ln -sf /dev/stdout /opt/cronicle/logs/Cronicle.log
 
 EXPOSE 3012
-EXPOSE 3013
 
-ENTRYPOINT [ "/init" ]
+ENTRYPOINT ["/sbin/tini", "--"]
+
+CMD [ "/run.sh" ]

README.md

@@ -1,58 +1,19 @@
 # Cronicle Docker
 
-![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)
+[![Build Status](https://drone.mrmeeb.stream/api/badges/MrMeeb/cronicle-docker/status.svg)](https://drone.mrmeeb.stream/MrMeeb/cronicle-docker) - _Every new commit triggers a build. I'm lazy._
 
-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`.
 
-This container can function in both the **manager** and **worker** role.
+Dockerised Cronicle, based on the [Cronicle-Edge](https://github.com/cronicle-edge/cronicle-edge) fork.
 
-## Links
+Can function in both the **manager** and **worker** role.
-- :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
-
-|Tag    |Description|
-|-------|-----------|
-|latest |Latest image built from the main branch. Usually coincides with a tagged release.|
-|develop|Latest image built from the develop branch. Commits are made to the develop branch before being merged to main. Old versions of `develop` are removed after 14 days.|
-
-Tags relating to releases are also available, for locking in on a specific version.
 
 ## Running 
 
-`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.
+`config.json`, located in `/config/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`. Make sure to change the `secret`!
+If you want to configure Cronicle before first run, download `config_sample.json` and adjust accordingly before placing in `/config/config.json`.
 
-: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:
+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.
 
 ### Docker CLI
 ```
@@ -60,9 +21,6 @@ docker run -d --name cronicle \
     --hostname cronicle-manager \
     -p 3012:3012 \
     -e MODE=manager \
-    -e PUID=1000 \
-    -e PGID=1000 \
-    -e TZ=Europe/London \
     -v {path on host}:/config
     git.mrmeeb.stream/mrmeeb/cronicle:latest 
 ```
@@ -83,45 +41,11 @@ services:
       - {path on host}:/config
     environment:
       - MODE=manager
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/London
 ```
 
 ## Custom Scripts
 
-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.
+This container automatically checks for scripts in `/config/init` and runs them at startup of the container. This could be useful if you need to install additional applications into a worker container so it can execute any 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.
-
-An example using nginx: 
-
-```  
-  location /socket.io/ {
-        client_max_body_size                    2048m;
-        proxy_read_timeout                      86400s;
-        proxy_send_timeout                      86400s;
-        proxy_set_header                        X-Forwarded-Host $host;
-        proxy_set_header                        X-Forwarded-Server $host;
-        proxy_set_header                        X-Real-IP $remote_addr;
-        proxy_set_header                        Host $host;
-        proxy_set_header                        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_http_version                      1.1;
-        proxy_redirect                          off;
-        proxy_set_header                        Upgrade $http_upgrade;
-        proxy_set_header                        Connection "upgrade"; 
-
-    proxy_pass          http://localhost:3012/socket.io/;
-  }
-  ```
-
-Source: https://github.com/jhuckaby/Cronicle/issues/535
-
-Load-balancing between multiple managers, as described [here](https://github.com/jhuckaby/Cronicle/blob/master/docs/Setup.md#load-balancers), has not been tested, and could behave strangely due to docker DNS.
 
 ## Ports
 
@@ -138,8 +62,4 @@ Load-balancing between multiple managers, as described [here](https://github.com
 ## Environment Variables
 |Variable|Options|Default|Description|
 |--------|-------|-------|-------|
-|MODE    |manager, worker|manager|Determines what mode Cronicle runs in
+|MODE    |manager, worker|manager|Determines what mode Cronicle runs in
-|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

@@ -1,69 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-echo ""
-echo ""
-echo "================================================"
-echo "|      __  _______  __  ___________________    |" 
-echo "|     /  |/  / __ \/  |/  / ____/ ____/ __ )   |"
-echo "|    / /|_/ / /_/ / /|_/ / __/ / __/ / __  |   |"
-echo "|   / /  / / _, _/ /  / / /___/ /___/ /_/ /    |"
-echo "|  /_/  /_/_/ |_/_/  /_/_____/_____/_____/     |"
-echo "|                                              |"
-echo "================================================"
-echo ""
-echo "Initialising container"
-echo "
-----------------------------------------------------------------------
-ENVIRONMENT
-----------------------------------------------------------------------
-PUID=${PUID}
-PGID=${PGID}
-TZ=${TZ}
-MODE=${MODE}
-LOG_LEVEL=${LOG_LEVEL}
-----------------------------------------------------------------------
-"
-
-#Setting UID and GID as configured
-if [[ ! "${PUID}" -eq 0 ]] && [[ ! "${PGID}" -eq 0 ]]; then
-    echo "Executing usermod..."
-    mkdir "/tmp/temphome"
-    usermod -d "/tmp/temphome" cronicle
-    usermod -o -u "${PUID}" cronicle
-    usermod -d /config cronicle
-    rm -rf "/tmp/temphome"
-    groupmod -o -g "${PGID}" cronicle
-else
-    echo "Running as root is not supported, please fix your PUID and PGID!"
-    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})" ]
-then
-    echo "Fixing permissions for /app (this can take some time)."
-    chown -R cronicle:cronicle /app || true
-fi
-
-if [ -n "$(find /config \! -user ${PUID})" ] || [ -n "$(find /config \! -group ${PGID})" ]
-then
-    echo "Fixing permissions for /config (this can take some time)."
-    chown -R cronicle:cronicle /config || true
-fi

root/cronicle-prepare.sh

@@ -1,125 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-echo "Preparing Cronicle"
-
-if [ ! -d /config/cronicle ]
-then
-
-    echo "Directory /config/cronicle not found. Creating."
-
-    mkdir /config/cronicle
-
-fi
-
-#Detecting what mode Cronicle should be started in
-if [ $MODE == "manager" ] 
-then
-
-    echo "Cronicle is running in 'manager' mode."
-
-    #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/conf/ssl.crt ] || [ ! -f /config/cronicle/conf/ssl.key ]
-    then
-
-        echo "One or both SSL components are missing. Generating."
-
-        rm -f /config/cronicle/conf/ssl.crt /config/cronicle/conf/ssl.key
-        openssl req -x509 -newkey rsa:4096 -keyout /config/cronicle/conf/ssl.key -out /config/cronicle/conf/ssl.crt -sha256 -days 3650 -nodes -subj "/C=XX/ST=StateName/L=CityName/O=CompanyName/OU=CompanySectionName/CN=CommonNameOrHostname"
-
-    fi
-    
-    if [ ! -f /config/cronicle/data/.setup_done ]
-    then
-
-        echo "Setup needed - running now."
-
-        /app/cronicle/bin/control.sh setup
-        touch /app/cronicle/data/.setup_done
-
-        #Moving data dir to /config, then linking it back into Cronicle
-        mv -n /app/cronicle/data /config/cronicle/data
-        rm -rf /app/cronicle/data
-        ln -s /config/cronicle/data /app/cronicle/data
-
-    else
-
-        echo "Setup already completed."
-
-        rm -rf /app/cronicle/data
-        ln -s /config/cronicle/data /app/cronicle/data
-
-    fi
-
-elif [ $MODE == "worker" ] 
-then
-
-    echo "Cronicle is running in 'worker' mode."
-
-    #Copying config directory to /config/cronicle/conf if not already there, then linking back into Cronicle
-    if [ ! -f /config/cronicle/conf/config.json ]
-    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
-        rm -rf /config/cronicle/conf/config.json
-        echo ''
-        echo ''
-        echo '*************************************'
-        exit 1
-
-    else
-
-        echo "Config is present."
-        echo "Linking persistent config dir back into Cronicle."
-
-        rm -rf /app/cronicle/conf
-        ln -s /config/cronicle/conf /app/cronicle/conf
-
-    fi
-
-else
-
-    echo "'$MODE' is not a recognised appion for the MODE environment variable. Accepted options are 'manager' and 'worker'."
-    exit 1
-
-fi
-
-#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/container-init/type

@@ -1 +0,0 @@
-oneshot

root/etc/s6-overlay/s6-rc.d/container-init/up

@@ -1 +0,0 @@
-/container-init.sh

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

@@ -1 +0,0 @@
-oneshot

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

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

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

@@ -1 +0,0 @@
-echo "$e" > /run/s6-linux-init-container-results/exitcode

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

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

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

@@ -1 +0,0 @@
-longrun

run.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+#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
+
+#Detecting what mode Cronicle should be started in
+if [ $MODE == "manager" ] 
+then
+    echo "Cronicle is running in 'manager' mode."
+    
+    #Copying config.json to /config if it isn't there already, then linking it back into Cronicle
+    mv -n /opt/cronicle/conf/config.json /config/config.json
+    rm -rf /opt/cronicle/conf/config.json
+    ln -s /config/config.json /opt/cronicle/conf/config.json
+
+    if [ ! -f /config/data/.setup_done ]
+    then
+
+        echo "Setup needed - running now."
+
+        /opt/cronicle/bin/control.sh setup
+        touch /opt/cronicle/data/.setup_done
+
+        #Moving data dir to /config, then linking it back into Cronicle
+        mv -n /opt/cronicle/data /config/data
+        rm -rf /opt/cronicle/data
+        ln -s /config/data /opt/cronicle/data
+
+        exec node /opt/cronicle/lib/main.js --color 1
+
+    else
+
+        rm -rf /opt/cronicle/data
+        ln -s /config/data /opt/cronicle/data
+
+        exec node /opt/cronicle/lib/main.js --color 1
+
+    fi
+
+elif [ $MODE == "worker" ] 
+then
+
+    echo "Cronicle is running in 'worker' mode."
+
+    if [ ! -f /config/config.json ]
+    then
+
+        echo "No config found. Copy config.json from the manager server and place it in the /config dir."
+
+        exit 0
+
+    else
+
+        #Removing default config.json and linking provided one back into Cronicle
+        rm -rf /opt/cronicle/conf/config.json
+        ln -s /config/config.json /opt/cronicle/conf/config.json
+
+        exec node /opt/cronicle/lib/main.js --color 1
+
+    fi
+
+else
+
+    echo "'$MODE' is not a recognised option for the MODE environment variable. Accepted options are 'manager' and 'worker'."
+
+fi