From 776e1472d85926ab386b6d57bfcca2838213dacf Mon Sep 17 00:00:00 2001
From: Bill Niblock <bill@theinternetvagabond.com>
Date: Thu, 13 Jun 2024 21:29:14 -0400
Subject: [PATCH] Clean-up a bit

---
 .forgejo/workflows/release.yml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
index b440617..195d903 100644
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@@ -9,8 +9,6 @@ on:
 
 env:
   REGISTRY: forge.niblock.tech
-  REGISTRY_USERNAME: niblock
-  REGISTRY_PASSWORD: ${{ secrets.REGISTRY_TOKEN }}
 
 jobs:
   release:
@@ -21,32 +19,24 @@ jobs:
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
-
-      # - name: Setup Buildx
-      #   uses: https://code.forgejo.org/docker/setup-buildx-action@v3
-
-      # - name: Build
-      #   run: |
-      #     buildx build .docker/latest
       
       - name: Login to the NibTech Container Registry
         uses: https://code.forgejo.org/docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ env.REGISTRY_USERNAME }}
-          password: ${{ env.REGISTRY_PASSWORD }}
+          username: niblock
+          password: ${{ secrets.REGISTRY_TOKEN }}
       
       - name: Extract repository metadata (tags, labels)
         id: meta
         uses: https://github.com/docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE_NAME }}       
+          images: ${{ env.REGISTRY }}/${{ env.GITHUB_REPOSITORY }}
       
-      - name: Build and publish Alpine Latest
+      - name: Build and publish latest container
         uses: https://code.forgejo.org/docker/build-push-action@v5
         with:
           context: .docker/latest
           push: true
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.REGISTRY_IMAGE_NAME }}:latest
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}