Merge remote-tracking branch 'origin/QA-324_fixes_pipeline_library' into bugfix/KASM-8257_kali_black_screen

This commit is contained in:
Jonathan Rich 2026-04-16 17:25:50 -04:00
commit 25a3cd2200
No known key found for this signature in database
2 changed files with 22 additions and 4 deletions

View file

@ -1,9 +1,9 @@
############
# Settings #
############
image: docker:28.0.0
image: docker:29.4.0
services:
- docker:28.0.0-dind
- docker:29.4.0-dind
include:
- template: Code-Quality.gitlab-ci.yml

View file

@ -1,9 +1,9 @@
############
# Settings #
############
image: docker:28.0.0
image: docker:29.4.0
services:
- docker:28.0.0-dind
- docker:29.4.0-dind
stages:
- readme
- revert
@ -44,6 +44,9 @@ include:
{% for IMAGE in multiImages %}
build_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
stage: build
image: docker:28.2.2
services:
- docker:28.2.2-dind
extends:
- .run_rules
- .monitor-in-grafana
@ -74,6 +77,9 @@ build_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
{% for IMAGE in singleImages %}
build_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
stage: build
image: docker:28.2.2
services:
- docker:28.2.2-dind
extends:
- .run_rules
- .monitor-in-grafana
@ -247,6 +253,9 @@ scan_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
{% for IMAGE in multiImages %}
manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
stage: manifest
image: docker:28.2.2
services:
- docker:28.2.2-dind
extends:
- .run_rules
- .monitor-in-grafana
@ -277,6 +286,9 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
{% for IMAGE in singleImages %}
manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
stage: manifest
image: docker:28.2.2
services:
- docker:28.2.2-dind
extends:
- .run_rules
- .monitor-in-grafana
@ -311,6 +323,9 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
{% for IMAGE in multiImages %}
manifest_weekly_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
stage: manifest
image: docker:28.2.2
services:
- docker:28.2.2-dind
extends:
- .monitor-in-grafana
rules:
@ -335,6 +350,9 @@ manifest_weekly_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
{% for IMAGE in singleImages %}
manifest_weekly_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
stage: manifest
image: docker:28.2.2
services:
- docker:28.2.2-dind
extends:
- .monitor-in-grafana
rules: