Squashed all commits into one

.forgejo/workflows/build-on-commit.yml

@@ -1,31 +1,30 @@
-name: Build and Publish Docker Image on Commit
+name: Build Docker Image on Commit
-
+
-on:
+on:
-  push:
+  push:
-    branches:
+    branches:
-      - main
+      - main
-    tags: 
+    tags: 
-      - '!' # Exclude tags
+      - '!' # Exclude tags
-
+
-jobs:
+jobs:
-  build-and-publish:
+  build-and-publish:
-    runs-on: docker-builder
+    runs-on: docker-builder
-
+
-    steps:
+    steps:
-      - name: Checkout repository
+      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4
-
+
-      - name: Test Docker Hello World
+      - name: Set REPO_VARS
-        run: |
+        id: repo-url
-          echo "Testing Docker connection..."
+        run: |
-          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: |
+      - name: Build and push Docker image
-          echo "${{ secrets.OCI_TOKEN }}" | docker login git.merith.xyz -u "${{ secrets.OCI_USER }}" --password-stdin
+        run: |
-
+          # Build Docker image
-      - name: Build and push Docker image
+          docker build -t $REPO_HOST/$REPO_PATH:${{ github.sha }} .
-        run: |
+
-          REPO=git.merith.xyz/${{ github.repository }}
+          # Remove the local image to save storage
-          # Build and push multi-platform Docker images
+          docker rmi $REPO_HOST/$REPO_PATH:${{ github.sha }}
-          docker build -t $REPO:${{ github.sha }} --push .

.forgejo/workflows/build-on-tag.yml

@@ -13,21 +13,21 @@ 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..."
+          echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
-          docker run hello-world
+          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 tag $REPO_HOST/$REPO_PATH:$TAG $REPO_HOST/$REPO_PATH:latest
-          docker push $REPO:latest
+          docker push $REPO_HOST/$REPO_PATH:latest

Makefile

@@ -0,0 +1,14 @@
+# Makefile for squashing Git commits
+
+.PHONY: squash
+
+squash:
+	@echo "Checking out the main branch..."
+	git checkout main
+	@echo "Resetting to the initial commit..."
+	git reset --soft $$(git rev-list --max-parents=0 HEAD)
+	@echo "Creating a new commit..."
+	git commit -m "Squashed all commits into one"
+	@echo "Force pushing changes to the remote repository..."
+	git push origin main --force
+	@echo "Squash complete!"

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.