@@ -59,32 +59,24 @@ jobs:
5959 working-directory : ${{ runner.temp }}/digests
6060 run : |
6161 set -x
62- docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}-${{ matrix.os }}" --progress=plain \
62+ docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event. inputs.release_number }}-${{ matrix.os }}" --progress=plain \
6363 $(printf '${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}@sha256:%s ' *)
6464
6565 # just for logging
6666 - name : Inspect OS specific image
6767 run : |
68- docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}-${{ matrix.os }}
68+ docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event. inputs.release_number }}-${{ matrix.os }}
6969
7070 # debian images are the default / official ones, so these get the os-less tag
7171 - name : Tag Debian with os-less tags
7272 if : ${{ matrix.os == 'debian' }}
7373 working-directory : ${{ runner.temp }}/digests
7474 run : |
7575 set -x
76- docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}" ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}-${{ matrix.os }}
77-
78- # debian images are the default / official ones, so these get the latest tag
79- - name : Tag Debian with latest tags
80- if : ${{ (matrix.os == 'debian') && (inputs.is_latest == 'true' || inputs.is_latest == true) }}
81- working-directory : ${{ runner.temp }}/digests
82- run : |
83- set -x
84- docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:latest" ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}-${{ matrix.os }}
76+ docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event.inputs.release_number }}" ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event.inputs.release_number }}-${{ matrix.os }}
8577
8678 # just for logging
8779 - name : Inspect default images
8880 if : ${{ matrix.os == 'debian' }}
8981 run : |
90- docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}
82+ docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event. inputs.release_number }}
0 commit comments