From 96d14c4c8704eb8b42fc6750523cc03ab529683d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Mon, 9 May 2022 21:12:18 +0200
Subject: [PATCH] testing

---
 .gitlab-ci.yml  | 8 +++++---
 assets/linux.mk | 2 +-
 assets/macos.mk | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f73d60..1579ecd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,8 @@ Build Docker Images:
           - fedora35
           - macos-x86_64
           - macos-aarch64
+  variables:
+    DOCKER_HOST: tcp://docker:2375
   # Install docker and make
   before_script:
     - apt-get update
@@ -34,9 +36,9 @@ Build Docker Images:
     - apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin make
   # Build container
   script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - DOCKER_HOST="tcp://docker:2375" make docker-$DISTRO
-    - docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com
+    - make docker-$DISTRO
+    - docker push registry.gitlab.com/librewolf-community/browser/bsys5/$DISTRO:latest
 
 Build:
   stage: build
diff --git a/assets/linux.mk b/assets/linux.mk
index 3d02d7f..2c2dded 100644
--- a/assets/linux.mk
+++ b/assets/linux.mk
@@ -12,7 +12,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
 
 docker :
-	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile
+	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum
 
diff --git a/assets/macos.mk b/assets/macos.mk
index d6ba4af..a85666b 100644
--- a/assets/macos.mk
+++ b/assets/macos.mk
@@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
 outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
 
 docker :
-	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
+	docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t registry.gitlab.com/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
 
 build : $(outfile) $(outfile).sha256sum