From dc636b05edcd7b5f89addc9edadcb0ae5aec5b2f Mon Sep 17 00:00:00 2001
From: Devan Carpenter <dvn@pep-project.org>
Date: Mon, 4 Sep 2023 09:49:07 -0400
Subject: [PATCH] CI: use cookiejar container registry

---
 .gitlab-ci.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d31f31..381b23d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ bookworm:
     - linux
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
   needs:
     - codespell
   script:
@@ -67,7 +67,7 @@ makefile:
     - linux
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bookworm-prebuild:latest
   needs:
     - codespell
   script:
@@ -86,7 +86,7 @@ all_commits:
   # Test each commit up to main, to facilitate bisecting.
   stage: test
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
   needs: ["rust-stable"]
   script:
     - apt update && apt install -y libbotan-2-dev
@@ -101,7 +101,7 @@ codespell:
     - linux
   stage: pre-check
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/bookworm:latest
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bookworm:latest
 
   before_script:
     - *before_script_start
@@ -116,7 +116,7 @@ rust-stable:
     - linux
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
   before_script:
     - *before_script_start
     - rustup override set stable
@@ -133,7 +133,7 @@ rust-stable-armv7:
     - linux
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye-cross-arm-prebuild:latest
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/bullseye-cross-arm-prebuild:latest
   before_script:
     - *before_script_start
     - cat .ci/snippet_for_cross_compilation_config.toml >> .cargo/config.toml
@@ -154,7 +154,7 @@ windows-gnu-cng:
     - win2019
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-gnu
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-gnu
   before_script:
     # the default before_scipt scriptlet doesn't work on Powershell
     - rustup default "1.63.0"
@@ -176,7 +176,7 @@ windows-msvc-cng:
     - win2019
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-msvc
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
   before_script:
     # We don't call *before_script_start or *before_script_end as we
     # don't have bash, clang, etc.
@@ -196,7 +196,7 @@ windows-msvc-nmakefile:
     - win2019
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-msvc
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
   before_script:
     # We don't call *before_script_start or *before_script_end as we
     # don't have bash, clang, etc.
@@ -216,7 +216,7 @@ windows-msvc-msbuild:
     - win2019
   stage: build
   interruptible: true
-  image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-msvc
+  image: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
   before_script:
     # We don't call *before_script_start or *before_script_end as we
     # don't have bash, clang, etc.
@@ -240,7 +240,7 @@ windows-msvc32-cng:
   stage: build
   interruptible: true
   image:
-    name: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-msvc
+    name: $CONTAINER_REGISTRY/sequoia-pgp/build-docker-image/windows-msvc
     # Set up a cross compilation environment for building x86 binaries on amd64, line copied from Dockerfile.windows.msvc
     # see https://renenyffenegger.ch/notes/Windows/dirs/Program-Files-x86/Microsoft-Visual-Studio/version/edition/Common7/Tools/VsDevCmd_bat
     #
@@ -263,6 +263,7 @@ windows-msvc32-cng:
     CFLAGS: "" # Silence some C warnings when compiling with MSVC
 
 variables:
+  CONTAINER_REGISTRY: "192.168.122.1:5000"
   DEBIAN_FRONTEND: noninteractive
   CARGO_HOME: $CI_PROJECT_DIR/../cargo
   CARGO_FLAGS: --color always
-- 
GitLab