Aktualisieren .gitlab-ci.yml

.gitlab-ci.yml

@@ -2,7 +2,6 @@ variables:
   KUBECTL: "quay.io/bitnami/kubectl:1.18"
   NAMESPACE: "nane-kratzke"
   VERSION: "0.0.1"
-  BRANCH: "$CI_COMMIT_BRANCH"
   URL: "prime-nk.loki.th-luebeck.dev"
 
 stages:
@@ -10,7 +9,21 @@ stages:
     - build
     - deploy
 
-prime-container:
+prepare:
+    stage: prepare
+    image: 
+        name: $KUBECTL
+        entrypoint: [""]
+    script:
+        - kubectl apply -f deploy/storage -n $NAMESPACE
+        - kubectl delete secret gitlab-registry-credentials -n $NAMESPACE || true
+        - "kubectl create secret docker-registry gitlab-registry-credentials \
+                    --docker-server=$CI_REGISTRY \
+                    --docker-username=image-registry \ 
+                    --docker-password=$CI_REGISTRY_TOKEN \
+                    -n $NAMESPACE"
+
+build:
     stage: build
     services:
         - docker:dind
@@ -25,28 +38,7 @@ prime-container:
         - docker push $CI_REGISTRY_IMAGE/prime:$VERSION
         - docker push $CI_REGISTRY_IMAGE/prime:latest
 
-prime-storage:
-    stage: prepare
-    image: 
-        name: $KUBECTL
-        entrypoint: [""]
-    script:
-        - kubectl apply -f deploy/storage -n $NAMESPACE
-
-deploy-credentials:
-    stage: prepare
-    image: 
-        name: $KUBECTL
-        entrypoint: [""]
-    script:
-        - kubectl delete secret gitlab-registry-credentials -n $NAMESPACE || true
-        - "kubectl create secret docker-registry gitlab-registry-credentials \
-                    --docker-server=$CI_REGISTRY \
-                    --docker-username=image-registry \ 
-                    --docker-password=$CI_REGISTRY_TOKEN \
-                    -n $NAMESPACE"
-
-prime-service:
+deploy:
     stage: deploy
     image: 
         name: $KUBECTL