From 899b75f47dfcd8c3a8edb53095373f3445aabec8 Mon Sep 17 00:00:00 2001
From: Merith-TK <merith@merith.xyz>
Date: Wed, 2 Oct 2024 18:50:34 +0000
Subject: [PATCH 1/2] Squash all commits into one

remember to login to OCI

add nightly build

build nightly off commit

Squashed all commits into one
---
 .forgejo/workflows/build-on-commit.yml | 71 +++++++++++++++-----------
 .forgejo/workflows/build-on-tag.yml    | 20 +++++---
 Readme.md                              | 36 +++++++++++++
 3 files changed, 88 insertions(+), 39 deletions(-)
 create mode 100644 Readme.md

diff --git a/.forgejo/workflows/build-on-commit.yml b/.forgejo/workflows/build-on-commit.yml
index e18948c..e8f0d2e 100644
--- a/.forgejo/workflows/build-on-commit.yml
+++ b/.forgejo/workflows/build-on-commit.yml
@@ -1,31 +1,40 @@
-name: Build and Publish Docker Image on Commit
-
-on:
-  push:
-    branches:
-      - main
-    tags: 
-      - '!' # Exclude tags
-
-jobs:
-  build-and-publish:
-    runs-on: docker-builder
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Test Docker Hello World
-        run: |
-          echo "Testing Docker connection..."
-          docker run hello-world
-
-      - name: Login to OCI registry
-        run: |
-          echo "${{ secrets.OCI_TOKEN }}" | docker login git.merith.xyz -u "${{ secrets.OCI_USER }}" --password-stdin
-
-      - name: Build and push Docker image
-        run: |
-          REPO=git.merith.xyz/${{ github.repository }}
-          # Build and push multi-platform Docker images
-          docker build -t $REPO:${{ github.sha }} --push .
+name: Build Docker Image on Commit
+
+on:
+  push:
+    branches:
+      - main
+    tags: 
+      - '!' # Exclude tags
+
+jobs:
+  build-and-publish:
+    runs-on: docker-builder
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set REPO_VARS
+        id: repo-url
+        run: |
+          echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
+          echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
+
+      - name: Login to OCI registry
+        run: |
+          echo "${{ secrets.OCI_TOKEN }}" | docker login $REPO_HOST -u "${{ secrets.OCI_USER }}" --password-stdin
+
+      - name: Build and push Docker images
+        run: |
+          # Build Docker image with commit SHA
+          docker build -t $REPO_HOST/$REPO_PATH:${{ github.sha }} .
+          docker push $REPO_HOST/$REPO_PATH:${{ github.sha }}
+
+          # Build Docker image with nightly tag
+          docker tag $REPO_HOST/$REPO_PATH:${{ github.sha }} $REPO_HOST/$REPO_PATH:nightly
+          docker push $REPO_HOST/$REPO_PATH:nightly
+
+          # Remove local images to save storage
+          docker rmi $REPO_HOST/$REPO_PATH:${{ github.sha }}
+          docker rmi $REPO_HOST/$REPO_PATH:nightly
diff --git a/.forgejo/workflows/build-on-tag.yml b/.forgejo/workflows/build-on-tag.yml
index b8de1e7..888102b 100644
--- a/.forgejo/workflows/build-on-tag.yml
+++ b/.forgejo/workflows/build-on-tag.yml
@@ -13,21 +13,25 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Test Docker Hello World
+      - name: Set REPO_VARS
+        id: repo-url
         run: |
-          echo "Testing Docker connection..."
-          docker run hello-world
+          echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
+          echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
 
       - name: Login to OCI registry
         run: |
-          echo "${{ secrets.OCI_TOKEN }}" | docker login git.merith.xyz -u "${{ secrets.OCI_USER }}" --password-stdin
+          echo "${{ secrets.OCI_TOKEN }}" | docker login $REPO_HOST -u "${{ secrets.OCI_USER }}" --password-stdin
 
       - name: Build and push Docker image
         run: |
-          REPO=git.merith.xyz/${{ github.repository }}
           TAG=${{ github.ref_name }} # Get the tag name from the context
           # Build and push multi-platform Docker images
-          docker build -t $REPO:$TAG --push .
+          docker build -t $REPO_HOST/$REPO_PATH:$TAG --push .
           # Tag and push latest
-          docker tag $REPO:$TAG $REPO:latest
-          docker push $REPO:latest
+          docker tag $REPO_HOST/$REPO_PATH:$TAG $REPO_HOST/$REPO_PATH:latest
+          docker push $REPO_HOST/$REPO_PATH:latest
+
+          # Remove the local image to save storage
+          docker rmi $REPO_HOST/$REPO_PATH:$TAG
+          docker rmi $REPO_HOST/$REPO_PATH:latest
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 0000000..2904b26
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,36 @@
+# README for Docker Image Build and Publish Workflows
+
+## Overview
+
+This repository contains two GitHub Actions workflows that automate the building and publishing of Docker images to an OCI registry. 
+
+### Workflows
+
+1. **On Commit to Main**
+   - **Trigger:** Activates on commits to the `main` branch (tags are excluded).
+   - **Purpose:** Builds and publishes a Docker image for each commit.
+
+2. **On Tag Push**
+   - **Trigger:** Activates when a new tag is pushed.
+   - **Purpose:** Builds and publishes a Docker image for the tag and tags it as `latest`.
+
+## Prerequisites
+
+- **Secrets Needed:**
+  - `OCI_TOKEN`: Your OCI registry token.
+  - `OCI_USER`: Your OCI registry username.
+
+## How to Use
+
+1. **Clone the Repository:** Get a local copy of this repository.
+2. **Modify Dockerfile:** Update the `Dockerfile` for your application.
+3. **Push Changes:** Push changes to the `main` branch or create a new tag.
+4. **Check Workflow Status:** View the Actions tab in Forgjo to monitor workflow runs.
+
+## Notes
+
+- Ensure your Docker environment is compatible with multi-platform builds if necessary.
+
+## License
+
+This project is licensed under the MIT License. See the [LICENSE](LICENSE) file for details.
\ No newline at end of file

From 32826b49bc545bc9842bd5e6178b605ed463014b Mon Sep 17 00:00:00 2001
From: Merith <merith@merith.xyz>
Date: Fri, 9 May 2025 13:19:33 -0700
Subject: [PATCH 2/2] multiarch support

---
 .forgejo/workflows/build-on-commit.yml | 31 ++++++++++++++++----------
 .forgejo/workflows/build-on-tag.yml    | 29 +++++++++++++++---------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/.forgejo/workflows/build-on-commit.yml b/.forgejo/workflows/build-on-commit.yml
index e8f0d2e..fba6d8f 100644
--- a/.forgejo/workflows/build-on-commit.yml
+++ b/.forgejo/workflows/build-on-commit.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-    tags: 
+    tags:
       - '!' # Exclude tags
 
 jobs:
@@ -21,20 +21,27 @@ jobs:
           echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
           echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+          driver-opts: |
+            network=host
+
       - name: Login to OCI registry
         run: |
           echo "${{ secrets.OCI_TOKEN }}" | docker login $REPO_HOST -u "${{ secrets.OCI_USER }}" --password-stdin
 
-      - name: Build and push Docker images
+      - name: Build and push multi-arch Docker images
         run: |
-          # Build Docker image with commit SHA
-          docker build -t $REPO_HOST/$REPO_PATH:${{ github.sha }} .
-          docker push $REPO_HOST/$REPO_PATH:${{ github.sha }}
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --tag $REPO_HOST/$REPO_PATH:${{ github.sha }} \
+            --tag $REPO_HOST/$REPO_PATH:nightly \
+            --push \
+            .
 
-          # Build Docker image with nightly tag
-          docker tag $REPO_HOST/$REPO_PATH:${{ github.sha }} $REPO_HOST/$REPO_PATH:nightly
-          docker push $REPO_HOST/$REPO_PATH:nightly
-
-          # Remove local images to save storage
-          docker rmi $REPO_HOST/$REPO_PATH:${{ github.sha }}
-          docker rmi $REPO_HOST/$REPO_PATH:nightly
+      - name: Cleanup
+        run: |
+          docker buildx prune -f
+          docker logout $REPO_HOST
\ No newline at end of file
diff --git a/.forgejo/workflows/build-on-tag.yml b/.forgejo/workflows/build-on-tag.yml
index 888102b..012b946 100644
--- a/.forgejo/workflows/build-on-tag.yml
+++ b/.forgejo/workflows/build-on-tag.yml
@@ -18,20 +18,29 @@ jobs:
         run: |
           echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
           echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
+          echo "TAG=${{ github.ref_name }}" >> $GITHUB_ENV
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+          driver-opts: |
+            network=host
 
       - name: Login to OCI registry
         run: |
           echo "${{ secrets.OCI_TOKEN }}" | docker login $REPO_HOST -u "${{ secrets.OCI_USER }}" --password-stdin
 
-      - name: Build and push Docker image
+      - name: Build and push Docker images
         run: |
-          TAG=${{ github.ref_name }} # Get the tag name from the context
-          # Build and push multi-platform Docker images
-          docker build -t $REPO_HOST/$REPO_PATH:$TAG --push .
-          # Tag and push latest
-          docker tag $REPO_HOST/$REPO_PATH:$TAG $REPO_HOST/$REPO_PATH:latest
-          docker push $REPO_HOST/$REPO_PATH:latest
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --tag $REPO_HOST/$REPO_PATH:$TAG \
+            --tag $REPO_HOST/$REPO_PATH:latest \
+            --push \
+            .
 
-          # Remove the local image to save storage
-          docker rmi $REPO_HOST/$REPO_PATH:$TAG
-          docker rmi $REPO_HOST/$REPO_PATH:latest
\ No newline at end of file
+      - name: Cleanup
+        run: |
+          docker buildx prune -f
+          docker logout $REPO_HOST
\ No newline at end of file