diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3c6322520591b9cb97e877e662b9f1243aca447..a089676a6182d207bac3937b34a53ccea7c563c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ include: lint: stage: test - image: ruby:3.2.5 + image: ${GITLAB_DEPENDENCY_PROXY}ruby:3.2.5 script: - cd notifier - bundle install @@ -20,7 +20,7 @@ lint: shellcheck: stage: test - image: koalaman/shellcheck-alpine:stable + image: ${GITLAB_DEPENDENCY_PROXY}koalaman/shellcheck-alpine:stable before_script: - shellcheck --version script: @@ -32,7 +32,7 @@ notifier-rspec: matrix: - RUBY_VERSION: ruby:3.2.5 - RUBY_VERSION: ruby:2.7.0 - image: $RUBY_VERSION + image: ${GITLAB_DEPENDENCY_PROXY}$RUBY_VERSION script: - cd notifier - bundle install @@ -47,7 +47,7 @@ notifier-rspec: gitlab-rspec: stage: test - image: ruby:3.2.5 + image: ${GITLAB_DEPENDENCY_PROXY}ruby:3.2.5 script: - cd docker/gitlab - bundle install @@ -65,7 +65,7 @@ run pipeline: rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: manual - image: python:alpine + image: ${GITLAB_DEPENDENCY_PROXY}python:alpine variables: TOP_UPSTREAM_SOURCE_PROJECT: gitlab-org/gitlab before_script: diff --git a/db-testing.yml b/db-testing.yml index df613304f1883965020dc55c25965af3e7e9460d..937c158ebd149d2cbbcc8f585648d375645cbc39 100644 --- a/db-testing.yml +++ b/db-testing.yml @@ -102,9 +102,9 @@ image:dblab-ssh: image:redis: extends: .image:base variables: - IMAGE_NAME: "redis:7.0-alpine" + IMAGE_NAME: ${GITLAB_DEPENDENCY_PROXY}redis:7.0-alpine script: - - docker pull $IMAGE_NAME + - ${GITLAB_DEPENDENCY_PROXY}docker pull $IMAGE_NAME - docker tag ${IMAGE_NAME} ${DOCKER_REGISTRY}/${IMAGE_NAME} - docker push ${DOCKER_REGISTRY}/${IMAGE_NAME} @@ -155,7 +155,7 @@ db:migrations: notify-upstream: stage: final - image: "ruby:3.2.5" + image: ${GITLAB_DEPENDENCY_PROXY}ruby:3.2.5 rules: - if: '$CI_PIPELINE_SOURCE != "schedule"' tags: