delete old

practice/21.ci-cd/5.improvement_cicd/.gitlab-ci.yml

@@ -22,9 +22,9 @@ build:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - |
       /kaniko/executor --context $CI_PROJECT_DIR \
-      --cache=true --cache-repo=$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME \
+      --cache=true --cache-repo=$CI_REGISTRY_IMAGE \
       --dockerfile $CI_PROJECT_DIR/Dockerfile \
-      --destination $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
+      --destination ${CI_REGISTRY_IMAGE}:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
 
 deploy:dev:
   stage: deploy
@@ -37,7 +37,7 @@ deploy:dev:
     - kubectl config set-context ci --cluster=k8s --user=ci
     - kubectl config use-context ci
     - helm upgrade --install xpaste .helm
-        --set image=$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
+        --set image=$CI_REGISTRY_IMAGE
         --set imageTag=$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
         --debug
         --atomic
@@ -45,7 +45,6 @@ deploy:dev:
         --namespace $NAMESPACE-$CI_ENVIRONMENT_SLUG
   only:
     - master
-
 helm_lint:
   stage: linter
   image: centosadmin/kubernetes-helm:3.6.3
@@ -53,7 +52,7 @@ helm_lint:
     name: production
   script:
     - helm lint .helm
-        --set image=$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
+        --set image=$CI_REGISTRY_IMAGE
         --set imageTag=$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
   only:
     - master
@@ -65,7 +64,7 @@ template:
     name: production
   script:
     - helm template $CI_PROJECT_PATH_SLUG .helm
-        --set image=$CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
+        --set image=$CI_REGISTRY_IMAGE
         --set imageTag=$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
   only:
     - master