From d5e059f11ceb7dc73c32a2b624e0ce11dc14c4f4 Mon Sep 17 00:00:00 2001
From: Maxime Orefice <morefice@gitlab.com>
Date: Tue, 1 Apr 2025 10:25:05 +0200
Subject: [PATCH 1/2] Use dependency proxy

---
 .gitlab-ci.yml | 8 ++++----
 db-testing.yml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3c63225..8a8a9458 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:
@@ -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 df613304..937c158e 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:
-- 
GitLab


From ab8098dd5dd91fe68fc97c3359b02576841b953a Mon Sep 17 00:00:00 2001
From: Maxime Orefice <morefice@gitlab.com>
Date: Tue, 1 Apr 2025 10:55:24 +0200
Subject: [PATCH 2/2] add dependency_proxy to matrix jobs

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a8a9458..a089676a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
GitLab