From a9eebe72903feac878df3c635ed0b5dd498a38bd Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Thu, 18 May 2023 09:49:41 -0700
Subject: [PATCH] Switch to use the runners container registry

---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 972b03c..f1ac5c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,16 +4,16 @@ services:
   - docker:dind
 
 variables:
-  IMAGE_BASE: $CI_REGISTRY/openlp/openlp
+  IMAGE_BASE: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
 
 before_script:
-  - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 build-debian:
   stage: build
   script:
     - docker pull $IMAGE_BASE/debian || true
-    - docker build --cache-from openlp/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian .
+    - docker build --cache-from $IMAGE_BASE/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian .
     - docker push $IMAGE_BASE/debian:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/debian:latest
   only:
@@ -27,7 +27,7 @@ build-ubuntu:
   stage: build
   script:
     - docker pull $IMAGE_BASE/ubuntu || true
-    - docker build --cache-from openlp/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu .
+    - docker build --cache-from $IMAGE_BASE/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu .
     - docker push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/ubuntu:latest
   only:
@@ -40,7 +40,7 @@ build-fedora:
   stage: build
   script:
     - docker pull $IMAGE_BASE/fedora || true
-    - docker build --cache-from openlp/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora .
+    - docker build --cache-from $IMAGE_BASE/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora .
     - docker push $IMAGE_BASE/fedora:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/fedora:latest
   only:
@@ -53,7 +53,7 @@ build-arch:
   stage: build
   script:
     - docker pull $IMAGE_BASE/arch || true
-    - docker build --cache-from openlp/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch .
+    - docker build --cache-from $IMAGE_BASE/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch .
     - docker push $IMAGE_BASE/arch:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/arch:latest
   only:
@@ -66,7 +66,7 @@ build-angular:
   stage: build
   script:
     - docker pull $IMAGE_BASE/angular || true
-    - docker build --cache-from openlp/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular .
+    - docker build --cache-from $IMAGE_BASE/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular .
     - docker push $IMAGE_BASE/angular:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/angular:latest
   only:
@@ -79,7 +79,7 @@ build-documentation:
   stage: build
   script:
     - docker pull $IMAGE_BASE/documentation || true
-    - docker build --cache-from openlp/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation .
+    - docker build --cache-from $IMAGE_BASE/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation .
     - docker push $IMAGE_BASE/documentation:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/documentation:latest
   only: