diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92270eee737c7a8dcdf4ee62d2184a260b29f300..cac54dfdf3da4923dd101ce30cf553fffe5effda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -621,13 +621,32 @@ verify-dist: image: docker.io/alpine:${ALPINE_VERSION} stage: verify only: +<<<<<<< Updated upstream refs: - /^release-.*/ +======= + - /^release-.*/ +>>>>>>> Stashed changes before_script: - "apk add curl" script: - "curl -v --output /dev/null --fail https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/${APP_VERSION}/dist.tar.gz" +<<<<<<< Updated upstream +======= +verify-images: + image: docker.io/docker:${DOCKER_VERSION}-dind + stage: verify + only: + - /^release-.*/ + before_script: + - "apk add --no-cache wget bash" + - "wget -O /usr/local/sbin/regctl https://github.com/regclient/regclient/releases/download/v0.8.2/regctl-linux-amd64" + - "chmod +x /usr/local/sbin/regctl" + script: + - bash ./.gitlab/check-unsupported-images.sh + +>>>>>>> Stashed changes scan-sonarqube: image: sonarsource/sonar-scanner-cli:${SONARQUBE_VERSION} stage: scan