From 130b63ccddb64b10a881b150c93c0122e0698a9e Mon Sep 17 00:00:00 2001
From: itchyonion <itchyonion@torproject.org>
Date: Mon, 29 May 2023 10:11:32 -0700
Subject: [PATCH] use debian buster and bullseye as base images

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28003ff..c8a8a31 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
 
 variables:
   DEBIAN_FRONTEND: noninteractive
+  DEBIAN_OLD_STABLE: buster
+  DEBIAN_STABLE: bullseye
   REPRODUCIBLE_FLAGS: -trimpath -ldflags=-buildid=
 
 # set up apt for automated use
@@ -141,21 +143,21 @@ android:
     - gomobile bind -v -target=android $REPRODUCIBLE_FLAGS .
 
 go-1.18:
-  image: golang:1.18-stretch
+  image: golang:1.18-$DEBIAN_OLD_STABLE
   <<: *golang-docker-debian-template
   <<: *test-template
   script:
     - *go-test
 
 go-1.19:
-  image: golang:1.19-buster
+  image: golang:1.19-$DEBIAN_STABLE
   <<: *golang-docker-debian-template
   <<: *test-template
   script:
     - *go-test
 
 go-1.20:
-  image: golang:1.20-buster
+  image: golang:1.20-$DEBIAN_STABLE
   <<: *golang-docker-debian-template
   <<: *test-template
   script:
@@ -170,7 +172,7 @@ debian-testing:
 
 generate_tarball:
   stage: deploy
-  image: golang:1.19-buster
+  image: golang:1.19-$DEBIAN_STABLE
   rules:
     - if: $CI_COMMIT_TAG
   script: