Skip to content

Commit d241a5b

Browse files
nightly-dev build
1 parent e368e8c commit d241a5b

3 files changed

Lines changed: 11 additions & 53 deletions

File tree

.github/workflows/release-2-tag-docker-push.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,17 @@ jobs:
5353
uses: ./.github/workflows/release-x-manual-merge-container-digests.yml
5454
with:
5555
release_number: ${{ github.event.inputs.release_number }}
56-
is_latest: 'true'
57-
is_latest_boolean: true
58-
something: true
56+
secrets: inherit
57+
58+
# for releases we need to tag the images with the latest tag
59+
# we tried to parametrize this in the previous workflow after merging the digests,
60+
# but for some reason any parameter we add to the workflow will always be empty when referenced
61+
# simple enough to just add a explicit workflow for this until we figure out why
62+
tag-as-latest:
63+
needs: publish-container-digests
64+
uses: ./.github/workflows/release-x-manual-tag-as-latest.yml
65+
with:
66+
release_number: ${{ github.event.inputs.release_number }}
5967
secrets: inherit
6068

6169
release-helm-chart:

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

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ on:
1313
type: string
1414
description: 'Release version (x.y.z format)'
1515
required: true
16-
is_latest:
17-
type: string
18-
description: 'Whether to tag releases with latest'
19-
required: true
20-
default: 'false'
2116

2217
workflow_call:
2318
inputs:
@@ -27,26 +22,6 @@ on:
2722
type: string
2823
description: 'Release version (x.y.z format)'
2924
required: true
30-
is_latest:
31-
type: string
32-
description: 'Whether to tag releases with latest'
33-
required: true
34-
default: 'false'
35-
is_latest_boolean:
36-
type: boolean
37-
description: 'Whether to tag releases with latest'
38-
required: true
39-
default: false
40-
something:
41-
type: boolean
42-
description: 'Whether to tag releases with latest'
43-
required: true
44-
default: false
45-
something_default:
46-
type: boolean
47-
description: 'Whether to tag releases with latest'
48-
required: false
49-
default: false
5025

5126
jobs:
5227
merge-digests:
@@ -58,16 +33,6 @@ jobs:
5833
os: [alpine, debian]
5934

6035
steps:
61-
62-
- name: Print inputs
63-
run: |
64-
echo "Release number: ${{ inputs.release_number }}"
65-
echo "Is latest: ${{ inputs.is_latest }}"
66-
67-
- name: Debug inputs
68-
run: |
69-
echo "All inputs: ${{ toJson(github.event.inputs) }}"
70-
7136
# deduce docker org name from git repo to make the build also work in forks
7237
- id: Set-docker-org
7338
run: echo "DOCKER_ORG=$(echo ${GITHUB_REPOSITORY%%/*} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
@@ -108,11 +73,6 @@ jobs:
10873
working-directory: ${{ runner.temp }}/digests
10974
run: |
11075
set -x
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 }}]
11676
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 }}
11777
11878
# debian images are the default / official ones, so these get the latest tag
@@ -123,17 +83,8 @@ jobs:
12383
set -x
12484
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 }}
12585
126-
# debian images are the default / official ones, so these get the latest tag
127-
- name: Tag Debian with latest tags boolean
128-
if: ${{ (matrix.os == 'debian') && (inputs.is_latest_boolean == 'true' || inputs.is_latest_boolean == true) }}
129-
working-directory: ${{ runner.temp }}/digests
130-
run: |
131-
set -x
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 }}
133-
13486
# just for logging
13587
- name: Inspect default images
13688
if: ${{ matrix.os == 'debian' }}
13789
run: |
13890
docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:${{ inputs.release_number }}
139-
docker buildx imagetools inspect ${{ env.DOCKER_ORG }}/defectdojo-${{ matrix.docker-image}}:latest

.github/workflows/release-x-nightly-dev.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
uses: ./.github/workflows/release-x-manual-merge-container-digests.yml
5555
with:
5656
release_number: ${{ github.event.inputs.tag }}
57-
is_latest: 'false'
5857
secrets: inherit
5958

6059
release-helm-chart:

0 commit comments

Comments
 (0)