From f119c416dc5d008cf47b1b22ec743d73d9111859 Mon Sep 17 00:00:00 2001
From: James Kiger <james.kiger@gmail.com>
Date: Fri, 15 Dec 2023 12:43:56 -0500
Subject: [PATCH 1/2] Pin docker/dind to 24.0.6 to fix CI

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdbfb3682..f08899643 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,9 +8,9 @@ include:
 
 build:
   stage: build_test
-  image: docker
+  image: docker:24.0.6
   services:
-    - docker:dind
+    - docker:24.0.6-dind
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
   script:

From 5121002e7217964cdcd49c96605b832badbf1c50 Mon Sep 17 00:00:00 2001
From: James Kiger <james.kiger@gmail.com>
Date: Fri, 15 Dec 2023 13:21:18 -0500
Subject: [PATCH 2/2] Add note to revert fix when no longer needed

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f08899643..f1896a4cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,8 @@ include:
 
 build:
   stage: build_test
+  # Please un-pin the version (24.0.6) once the following GitLab issue is resolved:
+  # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17283
   image: docker:24.0.6
   services:
     - docker:24.0.6-dind