ci: fix build-args references

Author: WolfangAukang

.github/workflows/container-validation.yml

@@ -29,13 +29,13 @@ jobs:
       context_path: "simplerisk-minimal/"
       dockerfile_path: "simplerisk-minimal/Dockerfile"
       image_tag: "simplerisk/simplerisk-minimal:testing"
-      build_args: "version=8.1"
+      build_args: "php_version=8.1"
 
   simplerisk-minimal-php83:
     name: 'Verify simplerisk/simplerisk image based on PHP 8.3 with Apache'
     uses: ./.github/workflows/verify-image_rw.yml
     with:
       context_path: "simplerisk-minimal/"
-      dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
+      dockerfile_path: "simplerisk-minimal/Dockerfile"
       image_tag: "simplerisk/simplerisk-minimal:testing"
-      build_args: "version=8.3"
+      build_args: "php_version=8.3"

.github/workflows/push-to-dockerhub.yml

@@ -39,19 +39,21 @@ jobs:
     uses: ./.github/workflows/push-to-dockerhub_rw.yml
     with:
       context_path: "simplerisk-minimal"
-      dockerfile_path: "simplerisk-minimal/php81/Dockerfile"
+      dockerfile_path: "simplerisk-minimal/Dockerfile"
       image_name: "simplerisk/simplerisk-minimal"
       version: "20250411-001"
       os_version: "php81"
+      build_args: "php_version=8.1"
     secrets: inherit
   simplerisk-minimal-php83:
     name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.3 with Apache'
     uses: ./.github/workflows/push-to-dockerhub_rw.yml
     with:
       context_path: "simplerisk-minimal"
-      dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
+      dockerfile_path: "simplerisk-minimal/Dockerfile"
       image_name: "simplerisk/simplerisk-minimal"
       version: "20250411-001"
       os_version: "php83"
       main_image: true
+      build_args: "php_version=8.3"
     secrets: inherit

.github/workflows/push-to-dockerhub_rw.yml

@@ -27,6 +27,9 @@ on:
         description: Is this the latest image?
         default: false
         type: boolean
+      build_args:
+        description: Arguments to use on image at runtime
+        type: string
     secrets:
       DOCKER_USERNAME:
         required: true
@@ -60,6 +63,7 @@ jobs:
         context: ${{ inputs.context_path }}
         file: ${{ inputs.dockerfile_path }}
         push: ${{ github.event_name != 'pull_request' }}
+        build-args: ${{ inputs.build_args || '' }}
         tags: |
           ${{ inputs.image_name }}
           ${{ inputs.image_name }}:${{ inputs.version }}
@@ -72,6 +76,7 @@ jobs:
         context: ${{ inputs.context_path }}
         file: ${{ inputs.dockerfile_path }}
         push: ${{ github.event_name != 'pull_request' }}
+        build-args: ${{ inputs.build_args || '' }}
         tags: |
           ${{ inputs.image_name }}:${{ inputs.version }}-${{ inputs.os_version }}
         labels: ${{ steps.meta.outputs.labels }}

.github/workflows/verify-image_rw.yml

@@ -27,7 +27,7 @@ jobs:
           context: ${{ inputs.context_path }}
           file: ${{ inputs.dockerfile_path }}
           tags: ${{ inputs.image_tag }}
-          build_args: ${{ inputs.build_args || '' }}
+          build-args: ${{ inputs.build_args || '' }}
       - name: Run linter with Dockle
         uses: erzz/dockle-action@v1
         with: