From 7b6c2414465d30f2766f9c047c393af978a4527d Mon Sep 17 00:00:00 2001 From: James Jones Date: Fri, 23 Jun 2023 17:20:59 -0400 Subject: [PATCH] Testing conditional of matrix --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d397f1..73ca3dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: # See https://gitlab.com/gitlab-org/cluster-integration/cluster-applications/ variables: DOCKER_AUTH_CONFIG: ${HOME_NEXUS_DOCKER_AUTH_CONFIG} - image: "$HOME_NEXUS_DOCKER_REGISTRY_SHARED/podman/stable:latest" + image: "$HOME_NEXUS_DOCKER_REGISTRY_PROXY/podman/stable:latest" timeout: 3h 30m parallel: matrix: @@ -22,11 +22,11 @@ stages: script: &build_push - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY - export REGISTRY_IMAGE_LOWER=$(echo "$REGISTRY_IMAGE" | tr '[:upper:]' '[:lower:]') - - docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_SHARED . + - docker build --pull -t "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" --build-arg ARTIFACTORY=$HOME_NEXUS_DOCKER_REGISTRY_PROXY . - docker push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" before_script: &before_auth - dnf install -y podman-docker - - docker login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_SHARED + - docker login -u "$HOME_NEXUS_DOCKER_USER" -p "$HOME_NEXUS_DOCKER_PASSWORD" $HOME_NEXUS_DOCKER_REGISTRY_PROXY build:prereleases: stage: dind-build