Merge pull request '1.0.2' (#3) from develop into main

Reviewed-on: #3

.drone.yml

@@ -1,11 +1,12 @@
 kind: pipeline
 type: docker
-name: build-release-images
+name: build-main-images
 trigger:
   event:
     exclude:
     - pull_request
   ref:
+    - refs/heads/main
     - refs/tags/**
 
 platform:
@@ -18,16 +19,32 @@ steps:
   image: docker:git
   commands:
     - git fetch --tags
-  depends_on:
+  when:
-    - clone
+    ref:
+      - refs/tags/**
 
+  # Set tags for main branch
 - name: make-tags
   image: node
   commands:
-    - echo -n "${DRONE_TAG}, latest" > .tags
+    - echo -n "${DRONE_COMMIT_SHA:0:8}, latest" > .tags
+  when:
+    ref:
+      - refs/heads/main
   depends_on:
     - get-tags
 
+- name: make-tags-release
+  image: node
+  commands:
+    - echo -n "${DRONE_TAG}, latest" > .tags
+  when:
+    ref:
+      - refs/tags/**
+  depends_on:
+    - get-tags
+
+  # Build containers from main branch
 - name: build-gitea
   image: thegeeklab/drone-docker-buildx
   privileged: true
@@ -44,6 +61,7 @@ steps:
       - linux/amd64
   depends_on:
     - make-tags
+    - make-tags-release
 
 - name: build-github
   image: thegeeklab/drone-docker-buildx
@@ -61,6 +79,7 @@ steps:
       - linux/amd64
   depends_on:
     - make-tags
+    - make-tags-release
 
 - name: release-gitea
   image: goreleaser/goreleaser
@@ -69,6 +88,9 @@ steps:
       from_secret: gitea_token
   commands:
     - goreleaser release -f .goreleaser-gitea.yaml
+  when:
+    ref:
+      - refs/tags/**
   depends_on:
     - build-gitea
 
@@ -79,6 +101,9 @@ steps:
       from_secret: github_token
   commands:
     - goreleaser release -f .goreleaser-github.yaml
+  when:
+    ref:
+      - refs/tags/**
   depends_on:
     - build-github
 
@@ -95,80 +120,6 @@ steps:
     - 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

Dockerfile

@@ -10,7 +10,7 @@ ENV S6_OVERLAY_ARCH=aarch64
 FROM base-${TARGETARCH}${TARGETVARIANT}
 
 ARG S6_OVERLAY_VERSION=3.1.5.0
-ARG CRONICLE_EDGE_VERSION=.1.6.3
+ARG CRONICLE_EDGE_VERSION=1.6.2
 
 ENV CRONICLE_foreground=1
 ENV CRONICLE_echo=1

README.md

@@ -8,7 +8,7 @@ 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)
+- :whale2: [Containers](https://git.mrmeeb.stream/MrMeeb/-/packages/container/cronicle/latest) (also published the 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)