From f985d036d12895de54cf96f61deb8e91b766da69 Mon Sep 17 00:00:00 2001
From: Ethan Girouard <mr.egirouard@gmail.com>
Date: Thu, 25 Jan 2024 01:04:12 -0500
Subject: [PATCH] Use CI environment variables

---
 .gitlab-ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2551cc..2361f47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 # Build the project
 build:
   needs: []
-  image: registry.mregirouard.com/libretunes/ops/docker-leptos:latest
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
   script:
     - cargo-leptos build
 
@@ -12,18 +12,18 @@ docker-build:
   script:
     - /usr/local/bin/dockerd-entrypoint.sh &
     - while ! docker info; do echo "Waiting for Docker to become available..."; sleep 1; done
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.mregirouard.com
-    - docker build -t registry.mregirouard.com/libretunes/libretunes:$CI_COMMIT_SHORT_SHA .
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
       # If running on the default branch, tag as latest
     - if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then docker tag
-        registry.mregirouard.com/libretunes/libretunes:$CI_COMMIT_SHORT_SHA
-        registry.mregirouard.com/libretunes/libretunes:latest; fi
-    - docker push registry.mregirouard.com/libretunes/libretunes --all-tags
+        $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
+        $CI_REGISTRY_IMAGE:latest; fi
+    - docker push $CI_REGISTRY_IMAGE --all-tags
 
 # Run unit tests
 test:
   needs: ["build"]
-  image: registry.mregirouard.com/libretunes/ops/docker-leptos:latest
+  image: $CI_REGISTRY/libretunes/ops/docker-leptos:latest
   script:
     - cargo-leptos test