From c836b048ee6e11713bd347e15743963a80035411 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Wed, 15 Mar 2023 21:54:21 -0700
Subject: [PATCH] Change to use the GitLab registry

---
 .gitlab-ci.yml | 53 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45f3924..e28f0de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,19 +4,18 @@ services:
   - docker:dind
 
 variables:
-  DOCKER_HOST: tcp://docker:2375
-  DOCKER_DRIVER: overlay2
+  IMAGE_BASE: $CI_REGISTRY/openlp/openlp
 
 before_script:
-  - echo "$DOCKER_TOKEN" | docker login --username "$DOCKER_USER" --password-stdin
+  - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
 
 build-debian:
   stage: build
   script:
-    - docker pull openlp/debian || true
-    - docker build --cache-from openlp/debian --tag openlp/debian:$CI_COMMIT_SHA --tag openlp/debian:latest -f Dockerfile.debian .
-    - docker push openlp/debian:$CI_COMMIT_SHA
-    - docker push openlp/debian:latest
+    - 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 push $IMAGE_BASE/debian:$CI_COMMIT_SHA
+    - docker push $IMAGE_BASE/debian:latest
   only:
     refs:
       - master@openlp/runners
@@ -27,10 +26,10 @@ build-debian:
 build-ubuntu:
   stage: build
   script:
-    - docker pull openlp/ubuntu || true
-    - docker build --cache-from openlp/ubuntu --tag openlp/ubuntu:$CI_COMMIT_SHA --tag openlp/ubuntu:latest -f Dockerfile.ubuntu .
-    - docker push openlp/ubuntu:$CI_COMMIT_SHA
-    - docker push openlp/ubuntu:latest
+    - 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 push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA
+    - docker push $IMAGE_BASE/ubuntu:latest
   only:
     refs:
       - master@openlp/runners
@@ -40,10 +39,10 @@ build-ubuntu:
 build-fedora:
   stage: build
   script:
-    - docker pull openlp/fedora || true
-    - docker build --cache-from openlp/fedora --tag openlp/fedora:$CI_COMMIT_SHA --tag openlp/fedora:latest -f Dockerfile.fedora .
-    - docker push openlp/fedora:$CI_COMMIT_SHA
-    - docker push openlp/fedora:latest
+    - 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 push $IMAGE_BASE/fedora:$CI_COMMIT_SHA
+    - docker push $IMAGE_BASE/fedora:latest
   only:
     refs:
       - master@openlp/runners
@@ -53,10 +52,10 @@ build-fedora:
 build-arch:
   stage: build
   script:
-    - docker pull openlp/arch || true
-    - docker build --cache-from openlp/arch --tag openlp/arch:$CI_COMMIT_SHA --tag openlp/arch:latest -f Dockerfile.arch .
-    - docker push openlp/arch:$CI_COMMIT_SHA
-    - docker push openlp/arch:latest
+    - 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 push $IMAGE_BASE/arch:$CI_COMMIT_SHA
+    - docker push $IMAGE_BASE/arch:latest
   only:
     refs:
       - master@openlp/runners
@@ -66,10 +65,10 @@ build-arch:
 build-angular:
   stage: build
   script:
-    - docker pull openlp/angular || true
-    - docker build --cache-from openlp/angular --tag openlp/angular:$CI_COMMIT_SHA --tag openlp/angular:latest -f Dockerfile.angular .
-    - docker push openlp/angular:$CI_COMMIT_SHA
-    - docker push openlp/angular:latest
+    - 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 push $IMAGE_BASE/angular:$CI_COMMIT_SHA
+    - docker push $IMAGE_BASE/angular:latest
   only:
     refs:
       - master@openlp/runners
@@ -79,10 +78,10 @@ build-angular:
 build-documentation:
   stage: build
   script:
-    - docker pull openlp/documentation || true
-    - docker build --cache-from openlp/documentation --tag openlp/documentation:$CI_COMMIT_SHA --tag openlp/documentation:latest -f Dockerfile.documentation .
-    - docker push openlp/documentation:$CI_COMMIT_SHA
-    - docker push openlp/documentation:latest
+    - 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 push $IMAGE_BASE/documentation:$CI_COMMIT_SHA
+    - docker push $IMAGE_BASE/documentation:latest
   only:
     refs:
       - master@openlp/runners