From 0d38f258dc1d253c37329b0d676e401b3dd96a27 Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Thu, 23 Jun 2022 17:12:30 +0530
Subject: [PATCH] Fix Fix 2

Update gitlab-runner sources to use bullseye instead of buster.
Delaying this would lead to GLIBC compatibility issues.
A long term solution would be to base the debian_base image on debian
stable instead of testing.
---
 containers/debian/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile
index d298c1110..a0228889c 100644
--- a/containers/debian/Dockerfile
+++ b/containers/debian/Dockerfile
@@ -17,6 +17,7 @@ ENV CLICOLOR_FORCE=1                                                    \
 
 ## Install additional packages. Remove the auto-cleanup functionality
 ## for docker, as we're using the new buildkit cache instead.
+## We also install gitlab-runner, from the bullseye package (as bookworm is not available atm)
 ## TODO: libyaml-cpp-dev is a dependency for afterburner. We can probably remove
 ##       this once afterburner is added to spack
 RUN --mount=type=cache,target=/var/cache/apt                            \
@@ -69,6 +70,8 @@ RUN --mount=type=cache,target=/var/cache/apt                            \
  && curl -L                                                             \
     "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" \
     | bash                                                              \
+ && sed -i "s/bookworm/bullseye/"                                       \
+           /etc/apt/sources.list.d/runner_gitlab-runner.list            \
  && apt-get -yqq update                                                 \
  && apt-get -yqq install --no-install-recommends                        \
         gitlab-runner                                                   \
-- 
GitLab