Use $CI_REGISTRY_IMAGE

.gitlab-ci.yml

@@ -58,13 +58,13 @@ build:controller:
    - apk add -U make
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker pull $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/varnish-ingress/$IMAGE:latest || true
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish-ingress/$IMAGE:latest || true
     - cd container
     - make controller
-    - docker tag varnish-ingress/controller $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
-    - docker tag varnish-ingress/controller $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:latest
-    - docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
-    - docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:latest
+    - docker tag varnish-ingress/controller $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
+    - docker tag varnish-ingress/controller $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
+    - docker push $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest
 
 example:hello:
   extends: .integration-tests
@@ -205,13 +205,13 @@ example:authentication:proxy:
     - kubectl get pods --all-namespaces -o wide
     - kubectl get services --all-namespaces -o wide
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - docker pull $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/controller:$CI_COMMIT_SHA
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA
     # using varnish and haproxy image with latest tag due to performance. if we are changing this image a lot, we need to improve this as can lead to pulling the incorrect image
-    - docker pull $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/varnish:latest
-    - docker pull $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/haproxy:latest
-    - docker tag $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/controller:$CI_COMMIT_SHA varnish-ingress/controller
-    - docker tag $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/varnish:latest varnish-ingress/varnish
-    - docker tag $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/haproxy:latest varnish-ingress/haproxy
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish:latest
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:latest
+    - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/controller:$CI_COMMIT_SHA varnish-ingress/controller
+    - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/varnish:latest varnish-ingress/varnish
+    - docker tag $CI_REGISTRY_IMAGE/varnish-ingress/haproxy:latest varnish-ingress/haproxy
     - kind load docker-image varnish-ingress/varnish
     - kind load docker-image varnish-ingress/haproxy
     - kind load docker-image varnish-ingress/controller
@@ -232,13 +232,13 @@ example:authentication:proxy:
    - apk add -U make
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker pull $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/varnish-ingress/$IMAGE:latest || true
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish-ingress/$IMAGE:latest || true
     - cd container
     - make haproxy
-    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
-    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:latest
-    - docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
-    - docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:latest
+    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
+    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
+    - docker push $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest
 
 # basic step for a pipeline to build the varnish image
 .build-varnish:
@@ -252,10 +252,10 @@ example:authentication:proxy:
    - apk add -U make
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker pull $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/varnish-ingress/$IMAGE:latest || true
+    - docker pull $CI_REGISTRY_IMAGE/varnish-ingress/varnish-ingress/$IMAGE:latest || true
     - cd container
     - make varnish
-    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
-    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:latest
-    - docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
-    - docker push $CI_REGISTRY/timleers/k8s-ingress/varnish-ingress/$IMAGE:latest
+    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
+    - docker tag varnish-ingress/$IMAGE $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest
+    - docker push $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:$CI_COMMIT_SHA
+    - docker push $CI_REGISTRY_IMAGE/varnish-ingress/$IMAGE:latest