#369 Enable additional Docker tags

Allow a push of the Docker image with additional tags to override or
extend given images.

Author: ascheman

.github/workflows/gradle-build.yml

@@ -7,6 +7,11 @@ on:
   pull_request:
   push:
   workflow_dispatch:
+    inputs:
+      additional_tags:
+        description: 'Additional tags for Docker images (comma-separated)'
+        required: false
+        type: string
 
 jobs:
   build-artifacts:
@@ -150,7 +155,9 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle-caches
 
       - name: Execute Gradle build
-        run: ./gradlew dockerPush --scan --stacktrace
+        env:
+          ADDITIONAL_TAGS: ${{ inputs.additional_tags }}
+        run: ./gradlew dockerPush -Ddocker.image.additional.tags="${ADDITIONAL_TAGS}" --scan --stacktrace
 
       - name: Collect state upon failure
         if: failure()

action.yml

@@ -10,7 +10,6 @@ runs:
   using: 'docker'
   # If the image tag changes, e.g., to v3, the action in the test workflow (workflows/gradle-build.yml) must be adjusted accordingly
   image: 'docker://ghcr.io/aim42/hsc:v2'
-  entrypoint: '/bin/sh'
+  entrypoint: '/hsc.sh'
   args:
-  - -c
-  - java -jar /hsc.jar ${{ inputs.args }}
+    - ${{ inputs.args }}

htmlSanityCheck-cli/build.gradle

@@ -43,13 +43,19 @@ def dockerTags(Project project) {
         result += ['v' + project.version.substring(0, 1), 'latest']
     }
 
+    def additionalTags = System.getProperty('docker.image.additional.tags')
+    if (additionalTags) {
+        logger.quiet("Adding additional tags '${additionalTags}'")
+        result += additionalTags.split(',').collect { it.trim() }
+    }
+
     return result
 }
 
 docker {
     registry = "ghcr.io"
     repository = "aim42/hsc"
-    buildArgs = [VERSION: project.version]
+    buildArgs = ["VERSION": "${project.version}" as String]
     dockerFilePath = "."
     tags = dockerTags(project)
     applyLatestTag = false