foo

Author: tiredofit

.github/actions/build_simple_image/action.yaml

@@ -0,0 +1,46 @@
+name: "Build and Push Simple Docker Image"
+description: "Reusable action to build and push a Docker image for any repo, with simple platform/version args."
+inputs:
+  docker_username:
+    description: "DockerHub Username"
+    required: true
+  docker_password:
+    description: "DockerHub Password"
+    required: true
+  github_token:
+    description: "GitHub Token for GitHub Container Registry"
+    required: true
+  platforms:
+    description: "Target platforms (comma-separated, e.g. linux/amd64,linux/arm64)"
+    required: false
+    default: "linux/amd64,linux/arm64"
+  version:
+    description: "Image version tag (optional)"
+    required: false
+    default: ""
+runs:
+  using: "composite"
+  steps:
+    - name: Login to DockerHub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ inputs.docker_username }}
+        password: ${{ inputs.docker_password }}
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ inputs.github_token }}
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Build and Push Docker Image
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        file: ./Containerfile
+        platforms: ${{ inputs.platforms }}
+        push: true
+        tags: |
+          ghcr.io/${{ github.repository }}${{ inputs.version && format(':{}', inputs.version) || '' }}
+          docker.io/${{ github.repository }}${{ inputs.version && format(':{}', inputs.version) || '' }}

.github/workflows/build.yml

@@ -0,0 +1,27 @@
+name: Build Image (Manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      platforms:
+        description: 'Target platforms (comma-separated, e.g. linux/amd64,linux/arm64)'
+        required: false
+        default: 'linux/amd64,linux/arm64'
+      version:
+        description: 'Image version tag (optional)'
+        required: false
+        default: ''
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build and Push Docker Image
+        uses: ./.github/actions/build_simple_image
+        with:
+          docker_username: ${{ secrets.DOCKER_USERNAME }}
+          docker_password: ${{ secrets.DOCKER_PASSWORD }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          platforms: ${{ github.event.inputs.platforms }}
+          version: ${{ github.event.inputs.version }}

.github/workflows/main.yml

@@ -1,18 +1,18 @@
-name: Build, Tag, and Push Image (with Login Action)
+name: Build Image
 
 on:
   workflow_call:
     inputs:
-      docker_username:
-        required: true
+      platforms:
+        description: 'Target platforms (comma-separated, e.g. linux/amd64,linux/arm64)'
+        required: false
         type: string
-      docker_password:
-        required: true
-        type: string
-      github_token:
-        required: true
+        default: 'linux/amd64,linux/arm64'
+      version:
+        description: 'Image version tag (optional)'
+        required: false
         type: string
-      # Add any other inputs your action.yaml expects (e.g., DISTRO, DISTRO_VARIANT, etc.)
+        default: ''
     secrets:
       docker_username:
         required: true
@@ -26,10 +26,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Build, Tag, and Push
-        uses: ./.github/actions/action.yaml
+      - name: Build and Push Docker Image
+        uses: ./.github/actions/build_simple_image
         with:
           docker_username: ${{ secrets.docker_username }}
           docker_password: ${{ secrets.docker_password }}
           github_token: ${{ secrets.github_token }}
-          # Pass through any other needed inputs
+          platforms: ${{ inputs.platforms }}
+          version: ${{ inputs.version }}