From e96e611d4378cab05b6a6d76dd05c39dee8d4d53 Mon Sep 17 00:00:00 2001
From: Marc Cataford <mcat@riseup.net>
Date: Thu, 7 Nov 2024 13:48:56 -0500
Subject: [PATCH] refactor: standardize image names

---
 .forgejo/workflows/build-images.yml | 12 ++++++------
 service.yml                         |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.forgejo/workflows/build-images.yml b/.forgejo/workflows/build-images.yml
index 4690fd6..2498124 100644
--- a/.forgejo/workflows/build-images.yml
+++ b/.forgejo/workflows/build-images.yml
@@ -33,12 +33,12 @@ jobs:
       - name: Push tagged images to registry
         if: ${{ github.event_name == 'push' }}
         run: |
-          podman push localhost/sesame-caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:latest
-          podman push localhost/sesame-caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ steps.image-metadata.outputs.image-tag }}
-          podman push localhost/sesame-caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ github.ref_name }}
-          podman push localhost/sesame-promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:latest
-          podman push localhost/sesame-promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ steps.image-metadata.outputs.image-tag }}
-          podman push localhost/sesame-promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ github.ref_name }}
+          podman push localhost/sesame/caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:latest
+          podman push localhost/sesame/caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ steps.image-metadata.outputs.image-tag }}
+          podman push localhost/sesame/caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ github.ref_name }}
+          podman push localhost/sesame/promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:latest
+          podman push localhost/sesame/promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ steps.image-metadata.outputs.image-tag }}
+          podman push localhost/sesame/promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ github.ref_name }}
   post-run:
     runs-on: imagefactory-latest
     needs: [build]
diff --git a/service.yml b/service.yml
index 6d2a9fe..7a2bb0a 100644
--- a/service.yml
+++ b/service.yml
@@ -2,9 +2,9 @@ name: sesame
 build:
   images:
     - path: ./caddy.Dockerfile
-      tag: sesame-caddy
+      tag: sesame/caddy
     - path: ./promtail.Dockerfile
-      tag: sesame-promtail
+      tag: sesame/promtail
 ports:
   # Reverse proxied ports.
   - host: 53000
@@ -26,7 +26,7 @@ volumes:
   - name: caddy-logs
 containers:
   - name: caddy
-    image: sesame-caddy:latest
+    image: sesame/caddy:latest
     env-file: /etc/opt/spadinastan/sesame.env
     volumes:
       - name: caddy-data
@@ -36,7 +36,7 @@ containers:
       - name: caddy-logs
         container: /var/log/caddy
   - name: promtail
-    image: sesame-promtail:latest # Updated: 11/6/2024
+    image: sesame/promtail:latest # Updated: 11/6/2024
     volumes:
       - name: caddy-logs
         container: /var/caddy-logs