yaml

Signed-off-by: Roland Asmann <[email protected]>

Author: malice00

.github/actions/build-docker-image/action.yml

@@ -13,7 +13,6 @@ inputs:
     description: Labels to add to the image
   language:
     description: The language and version that is included in this image
-    required: true
   output:
     description: Controls what should be done with the image(s) after building
     required: true
@@ -37,7 +36,7 @@ runs:
           LANGUAGE=${{ inputs.language }}
           TAG=${{ inputs.tags[0] }}
           VERSION=${{ github.ref_name }}
-          ${{ fromJSON(inputs.docker-args) || '' }}
+          ${{ fromJSON(inputs.docker-args) }}
         context: .
         file: ${{ inputs.dockerfile }}
         labels: ${{ inputs.labels }}

.github/workflows/image-build.yml

@@ -88,7 +88,7 @@ jobs:
         with:
           build-arm: ${{ ! fromJSON(inputs.image).skip-arm }}
           dockerfile: ci/images/${{ fromJSON(inputs.image).distro }}/Dockerfile.${{ fromJSON(inputs.image).lang }}
-          docker-args: ${{ steps.nexus.outputs.docker-args }}
+          docker-args: ${{ steps.nexus.outputs.docker-args || '' }}
           images: |
              ${{ env.REPO }}/${{ env.TEAM }}/${{ fromJSON(inputs.image).base-image.name || fromJSON(inputs.image).distro || 'bci' }}-${{ fromJSON(inputs.image).base-image.lang || fromJSON(inputs.image).lang }}
              ${{ fromJSON(inputs.image).base-image.additional-image && format('{0}/{1}/{2}', env.REPO, env.TEAM, fromJSON(inputs.image).base-image.additional-image) || '' }}
@@ -103,7 +103,7 @@ jobs:
         with:
           build-arm: ${{ ! fromJSON(inputs.image).skip-arm }}
           dockerfile: ci/images/${{ fromJSON(inputs.image).distro }}/Dockerfile.${{ fromJSON(inputs.image).lang }}
-          docker-args: ${{ steps.nexus.outputs.docker-args }}
+          docker-args: ${{ steps.nexus.outputs.docker-args || '' }}
           images: |
             ${{ env.REPO }}/${{ env.TEAM }}/cdxgen${{ fromJSON(inputs.image).distro && format('-{0}', fromJSON(inputs.image).distro) }}-${{ fromJSON(inputs.image).lang }}
             ${{ fromJSON(inputs.image).cdxgen-image.additional-image && format('{0}/{1}/{2}', env.REPO, env.TEAM, fromJSON(inputs.image).cdxgen-image.additional-image) || '' }}
@@ -125,7 +125,7 @@ jobs:
         with:
           build-arm: ${{ ! fromJSON(inputs.image).skip-arm }}
           dockerfile: ci/images/${{ fromJSON(inputs.image).distro }}/Dockerfile.${{ fromJSON(inputs.image).lang }}
-          docker-args: ${{ steps.nexus.outputs.docker-args }}
+          docker-args: ${{ steps.nexus.outputs.docker-args || '' }}
           images: |
             ${{ env.REPO }}/${{ env.TEAM }}/cdxgen${{ fromJSON(inputs.image).distro && format('-{0}', fromJSON(inputs.image).distro) }}-${{ fromJSON(inputs.image).lang }}
             ${{ fromJSON(inputs.image).cdxgen-image.additional-image && format('{0}/{1}/{2}', env.REPO, env.TEAM, fromJSON(inputs.image).cdxgen-image.additional-image) || '' }}