Merge branch 'develop' into 'main'
Some checks failed
Build podman-dind-like / build-and-push (GITHUB_TOKEN, HOME_NEXUS_DOCKER_PASSWORD, NEXUS_DOCKER_USER, ghcr.io, $NEXUS_PROXY_REGISTRY, GITHUB_DOCKER_USER) (push) Has been cancelled
Build podman-dind-like / build-and-push (HOME_NEXUS_DOCKER_PASSWORD, HOME_NEXUS_DOCKER_PASSWORD, NEXUS_DOCKER_USER, nexus.jamesjonesconsulting.com:5443, $NEXUS_PROXY_REGISTRY, NEXUS_DOCKER_USER) (push) Has been cancelled

Aligning Gitlab CI to run both on Gitlab.com and gitlab.jamesjonesconsulting.com

See merge request ymdllc/containers/podman-dind-like!12
This commit is contained in:
Administrator
2023-06-23 23:10:02 +00:00

View File

@@ -5,7 +5,7 @@ stages:
# See https://gitlab.com/gitlab-org/cluster-integration/cluster-applications/ # See https://gitlab.com/gitlab-org/cluster-integration/cluster-applications/
variables: variables:
DOCKER_AUTH_CONFIG: ${HOME_NEXUS_DOCKER_AUTH_CONFIG} 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 timeout: 3h 30m
parallel: parallel:
matrix: matrix:
@@ -22,32 +22,37 @@ stages:
script: &build_push script: &build_push
- docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" $REGISTRY
- export REGISTRY_IMAGE_LOWER=$(echo "$REGISTRY_IMAGE" | tr '[:upper:]' '[:lower:]') - 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" - docker push "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG"
before_script: &before_auth before_script: &before_auth
- dnf install -y podman-docker - 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: build:prereleases:
stage: dind-build stage: dind-build
extends: .base extends: .base
tags: tags:
- big-build - build
- medium
before_script: before_script:
- *before_auth - *before_auth
script: script:
- export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | sed 's|/|-|g') - export IMAGE_TAG=$(echo -en $CI_COMMIT_REF_NAME | sed 's|/|-|g')
- *build_push - *build_push
only: only:
refs:
- branches - branches
variables:
- '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || $CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/'
except: except:
refs:
- main - main
build:releases: build:releases:
extends: .base extends: .base
stage: dind-build stage: dind-build
tags: tags:
- big-build - build
- medium
before_script: before_script:
- *before_auth - *before_auth
script: script:
@@ -56,5 +61,8 @@ build:releases:
- docker tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest" - docker tag "$REGISTRY_IMAGE_LOWER:$IMAGE_TAG" "$REGISTRY_IMAGE_LOWER:latest"
- docker push "$REGISTRY_IMAGE_LOWER:latest" - docker push "$REGISTRY_IMAGE_LOWER:latest"
only: only:
refs:
- tags - tags
variables:
- '($CI_PROJECT_URL =~ /gitlab\.jamesjonesconsulting\.com/ && $REGISTRY_USER == "$HOME_NEXUS_DOCKER_USER") || $CI_PROJECT_URL !~ /gitlab\.jamesjonesconsulting\.com/'