Skip to content

Commit e368e8c

Browse files
nightly-dev build
1 parent 7f1e174 commit e368e8c

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/release-x-manual-merge-container-digests.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161

6262
- name: Print inputs
6363
run: |
64-
echo "Release number: ${{ github.event.inputs.release_number }}"
65-
echo "Is latest: ${{ github.event.inputs.is_latest }}"
64+
echo "Release number: ${{ inputs.release_number }}"
65+
echo "Is latest: ${{ inputs.is_latest }}"
6666
6767
- name: Debug inputs
6868
run: |
@@ -94,46 +94,46 @@ jobs:
9494
working-directory: ${{ runner.temp }}/digests
9595
run: |
9696
set -x
97-
docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event.inputs.release_number }}-${{ matrix.os }}" --progress=plain \
97+
docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}-${{ matrix.os }}" --progress=plain \
9898
$(printf '${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}@sha256:%s ' *)
9999
100100
# just for logging
101101
- name: Inspect OS specific image
102102
run: |
103-
docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event.inputs.release_number }}-${{ matrix.os }}
103+
docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}-${{ matrix.os }}
104104
105105
# debian images are the default / official ones, so these get the os-less tag
106106
- name: Tag Debian with os-less tags
107107
if: ${{ matrix.os == 'debian' }}
108108
working-directory: ${{ runner.temp }}/digests
109109
run: |
110110
set -x
111-
echo release_number: [${{ github.event.inputs.release_number }}]
112-
echo is_latest: [${{ github.event.inputs.is_latest }}]
113-
echo is_latest_boolean: [${{ github.event.inputs.is_latest_boolean }}]
114-
echo something: [${{ github.event.inputs.something }}]
115-
echo something_default: [${{ github.event.inputs.something_default }}]
116-
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 }}
111+
echo release_number: [${{ inputs.release_number }}]
112+
echo is_latest: [${{ inputs.is_latest }}]
113+
echo is_latest_boolean: [${{ inputs.is_latest_boolean }}]
114+
echo something: [${{ inputs.something }}]
115+
echo something_default: [${{ inputs.something_default }}]
116+
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 }}
117117
118118
# debian images are the default / official ones, so these get the latest tag
119119
- name: Tag Debian with latest tags
120-
if: ${{ (matrix.os == 'debian') && (github.event.inputs.is_latest == 'true' || github.event.inputs.is_latest == true) }}
120+
if: ${{ (matrix.os == 'debian') && (inputs.is_latest == 'true' || inputs.is_latest == true) }}
121121
working-directory: ${{ runner.temp }}/digests
122122
run: |
123123
set -x
124-
docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:latest" ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event.inputs.release_number }}-${{ matrix.os }}
124+
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 }}
125125
126126
# debian images are the default / official ones, so these get the latest tag
127127
- name: Tag Debian with latest tags boolean
128-
if: ${{ (matrix.os == 'debian') && (github.event.inputs.is_latest_boolean == 'true' || github.event.inputs.is_latest_boolean == true) }}
128+
if: ${{ (matrix.os == 'debian') && (inputs.is_latest_boolean == 'true' || inputs.is_latest_boolean == true) }}
129129
working-directory: ${{ runner.temp }}/digests
130130
run: |
131131
set -x
132-
docker buildx imagetools create -t "${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:latest" ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event.inputs.release_number }}-${{ matrix.os }}
132+
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 }}
133133
134134
# just for logging
135135
- name: Inspect default images
136136
if: ${{ matrix.os == 'debian' }}
137137
run: |
138-
docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ github.event.inputs.release_number }}
138+
docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}
139139
docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:latest

0 commit comments

Comments
 (0)