redesign around s6-overlay

.drone.yml

@@ -1,12 +1,11 @@
 kind: pipeline
 type: docker
-name: build-main-images
+name: build-release-images
 trigger:
   event:
     exclude:
     - pull_request
   ref:
-    - refs/heads/main
     - refs/tags/**
 
 platform:
@@ -14,34 +13,14 @@ platform:
   arch: amd64
 
 steps:
-
-- name: get-tags
-  image: docker:git
-  commands:
-    - git fetch --tags
-  when:
-    ref:
-      - refs/tags/**
-
-  # Set tags for main branch
-- name: make-tags
-  image: node
-  commands:
-    - echo -n "${DRONE_COMMIT_SHA:0:8}, latest" > .tags
-  when:
-    ref:
-      - refs/heads/main
-
-- name: make-tags-release
+  # Set tags for main branch - release tag and 'latest'
+- name: make-tags-main
   image: node
   commands:
     - echo -n "${DRONE_TAG}, latest" > .tags
-  when:
-    ref:
-      - refs/tags/**
 
-  # Build containers from main branch
-- name: build
+  # Build containers from main branch when released
+- name: build-main
   image: thegeeklab/drone-docker-buildx
   privileged: true
   settings:
@@ -63,9 +42,6 @@ steps:
       from_secret: gitea_token
   commands:
     - goreleaser release
-  when:
-    ref:
-      - refs/tags/**
 
 - name: notify
   image: plugins/slack
@@ -94,13 +70,13 @@ platform:
 
 steps:
   # Set tags for develop branch - git commit SHA and 'develop'
-- name: make-tags
+- name: make-tags-develop
   image: node
   commands:
-    - echo -n "develop-${DRONE_COMMIT_SHA:0:8}, develop" > .tags
+    - echo -n "${DRONE_COMMIT_SHA:0:8}, develop" > .tags
    
   # Build containers from develop branch
-- name: build
+- name: build-develop
   image: thegeeklab/drone-docker-buildx
   privileged: true
   settings:

.gitignore

@@ -1,2 +0,0 @@
-dist/
-.tags

Dockerfile

@@ -1,16 +1,6 @@
-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}
+FROM alpine:latest
 
 ARG S6_OVERLAY_VERSION=3.1.5.0
-ARG CRONICLE_EDGE_VERSION=1.6.2
 
 ENV CRONICLE_foreground=1
 ENV CRONICLE_echo=1
@@ -28,32 +18,29 @@ RUN apk update && apk add tzdata curl shadow bash xz 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
+    useradd -u 1000 -U -d /config -s /bin/false mrmeeb && \
+    usermod -G users mrmeeb
 
 #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
 
 #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 && \
-    rm -rf v${CRONICLE_EDGE_VERSION}.tar.gz
-
+RUN git clone https://github.com/cronicle-edge/cronicle-edge.git /app/cronicle
 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 && \
-    chown -R ${PUID}:${PGID} /app /config
+    chmod +x /container-init.sh
 
 EXPOSE 3012
 

README.md

@@ -1,20 +1,9 @@
 # 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)
-
 Dockerised Cronicle, based on the [Cronicle-Edge](https://github.com/cronicle-edge/cronicle-edge) fork.
 
 Can function in both the **manager** and **worker** role.
 
-## 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.

root/container-init.sh

@@ -28,26 +28,26 @@ MODE=${MODE}
 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
+    usermod -d "/tmp/temphome" mrmeeb
+    usermod -o -u "${PUID}" mrmeeb
+    usermod -d /config mrmeeb
     rm -rf "/tmp/temphome"
-    groupmod -o -g "${PGID}" cronicle
+    groupmod -o -g "${PGID}" mrmeeb
 else
     echo "Running as root is not supported, please fix your PUID and PGID!"
     exit 1
 fi
 
-echo "Checking permissions in /config and /app."
+echo "Checking permissions in /config and /app (this can take some time)."
 
 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
+    echo "Fixing permissions for /app."
+    chown -R mrmeeb:mrmeeb /app
 fi
 
 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
+    echo "Fixing permissions for /config."
+    chown -R mrmeeb:mrmeeb /config
 fi

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

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

@@ -1 +1 @@
-exec s6-setuidgid cronicle /cronicle-prepare.sh
+exec s6-setuidgid mrmeeb /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 cronicle node /app/cronicle/lib/main.js --color 1
+exec s6-setuidgid mrmeeb node /app/cronicle/lib/main.js --color 1