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

@@ -1,4 +1,4 @@
-name: Build Docker Image on Commit
+name: Build and Publish Docker Image on Commit
 
 on:
   push:
@@ -15,33 +15,17 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set REPO_VARS
+      - name: Test Docker Hello World
-        id: repo-url
         run: |
-          echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
+          echo "Testing Docker connection..."
-          echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
+          docker run hello-world
-
-      - 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
+          echo "${{ secrets.OCI_TOKEN }}" | docker login git.merith.xyz -u "${{ secrets.OCI_USER }}" --password-stdin
 
-      - name: Build and push multi-arch Docker images
+      - name: Build and push Docker image
         run: |
-          docker buildx build \
+          REPO=git.merith.xyz/${{ github.repository }}
-            --platform linux/amd64,linux/arm64 \
+          # Build and push multi-platform Docker images
-            --tag $REPO_HOST/$REPO_PATH:${{ github.sha }} \
+          docker build -t $REPO:${{ github.sha }} --push .
-            --tag $REPO_HOST/$REPO_PATH:nightly \
-            --push \
-            .
-
-      - name: Cleanup
-        run: |
-          docker buildx prune -f
-          docker logout $REPO_HOST

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

@@ -13,34 +13,21 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set REPO_VARS
+      - name: Test Docker Hello World
-        id: repo-url
         run: |
-          echo "REPO_HOST=$(echo "${{ github.server_url }}" | sed 's~http[s]*://~~g')" >> $GITHUB_ENV
+          echo "Testing Docker connection..."
-          echo "REPO_PATH=${{ github.repository }}" >> $GITHUB_ENV
+          docker run hello-world
-          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
+          echo "${{ secrets.OCI_TOKEN }}" | docker login git.merith.xyz -u "${{ secrets.OCI_USER }}" --password-stdin
 
-      - name: Build and push Docker images
+      - name: Build and push Docker image
         run: |
-          docker buildx build \
+          REPO=git.merith.xyz/${{ github.repository }}
-            --platform linux/amd64,linux/arm64 \
+          TAG=${{ github.ref_name }} # Get the tag name from the context
-            --tag $REPO_HOST/$REPO_PATH:$TAG \
+          # Build and push multi-platform Docker images
-            --tag $REPO_HOST/$REPO_PATH:latest \
+          docker build -t $REPO:$TAG --push .
-            --push \
+          # Tag and push latest
-            .
+          docker tag $REPO:$TAG $REPO:latest
-
+          docker push $REPO:latest
-      - name: Cleanup
-        run: |
-          docker buildx prune -f
-          docker logout $REPO_HOST

Readme.md

@@ -1,36 +0,0 @@
-# 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.