Merge branch 'fix-conditional-build' into 'main'

Fix conditional build See merge request fablab/labsync!83
Build security-scanner image only when necessary
2023-10-05 19:11:44 +00:00 · 2023-10-04 15:50:13 +00:00
3 changed files with 3 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -84,7 +84,7 @@ security_scanner:

 lightburn-download:
  stage: prepare
-  image: quay.io/official-images/alpine
+  image: alpine
  script:
    - mkdir -p packer/ansible/roles/lightburn/files
    - 'wget -O packer/ansible/roles/lightburn/files/lightburn.zip  --header "JOB-TOKEN: $CI_JOB_TOKEN" "${CI_SERVER_URL}/api/v4/projects/fablab%2Flightburn-patched/jobs/artifacts/main/download?job=patch-Linux64"'
--- a/packer/debian-bookworm.yaml
+++ b/packer/debian-bookworm.yaml
@ -20,7 +20,7 @@ variables:

 builders:
 - discard: true
-  image: quay.io/official-images/debian:bookworm
+  image: debian:bookworm
  type: docker
  volumes:
    '{{user `images`}}': /tmp/images
--- a/security-scanner/Dockerfile
+++ b/security-scanner/Dockerfile
@ -1,4 +1,4 @@
-FROM quay.io/official-images/debian:bookworm-slim
+FROM debian:bookworm-slim

 RUN apt-get update \
 	&& apt-get -y install \
Author	SHA1	Message	Date
jalr	e6f23d798c	Merge branch 'fix-conditional-build' into 'main' Fix conditional build See merge request fablab/labsync!83	2023-10-05 19:11:44 +00:00
Jakob Lechner	f6070572fa	Build security-scanner image only when necessary	2023-10-04 15:50:13 +00:00