Merge branch 'main' into noelle/release-fix

.github/workflows/docker.yml

@@ -3,12 +3,15 @@ name: Docker
 on:
   push:
     branches: [main]
-    tags:
-      - 'v*'
+    tags: ["v*"]
 
 jobs:
   Build-and-Push:
     runs-on: ubuntu-latest
+
+    # We want to filter out dependabot and pre-commit
+    # automated pushes to main
+    if: ${{ github.actor != 'dependabot[bot]'}} && ${{ github.actor != 'pre-commit-ci[bot]'}}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -44,7 +47,6 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           push: true
-          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rodhaj:bot-build-cache
-          cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/rodhaj:bot-build-cache
-          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rodhaj-build-cache:bot
+          cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/rodhaj-build-cache:bot
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yml

@@ -31,11 +31,8 @@ jobs:
 
 
   Release:
-    permissions:
-      contents: write
-    needs: Bundle
-
     runs-on: ubuntu-latest
+    needs: Bundle
     if: contains(github.event.head_commit.message, '#major') || contains(github.event.head_commit.message, '#minor') || contains(github.event.head_commit.message, '#patch')
     steps:
     - uses: actions/checkout@v4
@@ -58,7 +55,7 @@ jobs:
       uses: anothrNick/[email protected]
       id: tag_version
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
         WITH_V: true
         RELEASE_BRANCHES: main
 

docker/Dockerfile

@@ -7,10 +7,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-  tini \
   bash \
-  netcat-traditional \
   git \
+  netcat-traditional \
+  tini \
   && apt-get clean
 
 WORKDIR /rodhaj

docker/docker-compose.prod.yml

@@ -3,7 +3,7 @@ name: rodhaj_prod
 services:
   rodhaj:
     container_name: rodhaj
-    image: ghcr.io/transprogrammer/rodhaj:latest
+    image: ghcr.io/transprogrammer/rodhaj:edge
     volumes:
       # Do not edit the next line. If you want to change the path of the configuration file, please edit the CONFIG_LOCATION variable
       - ${CONFIG_LOCATION}:/rodhaj/bot/config.yml

docker/docker-compose.yml

@@ -3,7 +3,7 @@ name: rodhaj
 services:
   rodhaj:
     container_name: rodhaj
-    image: ghcr.io/transprogrammer/rodhaj:latest
+    image: ghcr.io/transprogrammer/rodhaj:edge
     volumes:
       # Do not edit the next line. If you want to change the path of the configuration file, please edit the CONFIG_LOCATION variable
       - ${CONFIG_LOCATION}:/rodhaj/bot/config.yml