Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -19,8 +19,6 @@ hadolint:
   stage: lint
   script:
     - docker run --rm -i hadolint/hadolint hadolint - < Dockerfile
-  rules:
-    - if: ('$CI_COMMIT_BRANCH == "main"')
 
 test:
   stage: test
@@ -43,7 +41,7 @@ build:
     - docker build --pull -t ${DOCKER_IMAGE} .
     - docker push ${DOCKER_IMAGE}
     - |
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+      if [[ ${CI_COMMIT_BRANCH} == ${CI_DEFAULT_BRANCH} ]]; then
         docker tag ${DOCKER_IMAGE} ${DOCKER_IMAGE_LATEST}
         docker push ${CI_REGISTRY_IMAGE:latest}
       fi
@@ -57,12 +55,12 @@ build:
 build_main_tag:
   stage: build
   before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
-    - docker build -t "$DOCKER_IMAGE_TAG" .
-    - docker push "$DOCKER_IMAGE_TAG"
+    - docker build -t ${DOCKER_IMAGE_TAG} .
+    - docker push ${DOCKER_IMAGE_TAG}
   rules:
-    - if: ('$CI_COMMIT_BRANCH == "main"' && $CI_COMMIT_TAG)
+    - if: (${CI_COMMIT_BRANCH} == "main" && ${CI_COMMIT_TAG})
       exists:
         - Dockerfile
   dependencies:
@@ -72,12 +70,12 @@ build_main_tag:
 build_branch_tag:
   stage: build
   before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
-    - docker build -t "$DOCKER_IMAGE_BRANCH_TAG" .
-    - docker push "$DOCKER_IMAGE_BRANCH_TAG"
+    - docker build -t ${DOCKER_IMAGE_BRANCH_TAG} .
+    - docker push ${DOCKER_IMAGE_BRANCH_TAG}
   rules:
-    - if: ('$CI_COMMIT_BRANCH != "main"' && $CI_COMMIT_TAG)
+    - if: (${CI_COMMIT_BRANCH} != "main" && ${CI_COMMIT_TAG})
       exists:
         - Dockerfile
   dependencies:
@@ -88,13 +86,13 @@ deploy_main:
   stage: deploy
   image: dtzar/helm-kubectl
   before_script:
-    - mkdir -p "$KUBECONFIG_PATH"
+    - mkdir -p ${KUBECONFIG_PATH}
   script:
-    - echo "$KUBE_CONFIG" | base64 -d > "$KUBECONFIG"
+    - echo ${KUBE_CONFIG} | base64 -d > ${KUBECONFIG}
     - chmod 0600 ${KUBECONFIG}
     - helm upgrade --install diplom ./helm/nginx-feniks --set containers.tag=${CI_COMMIT_TAG}
   rules:
-    - if: ('$CI_COMMIT_BRANCH == "main"' && $CI_COMMIT_TAG)
+    - if: (${CI_COMMIT_BRANCH} == "main" && ${CI_COMMIT_TAG})
   dependencies:
     - build_main_tag
 
@@ -104,11 +102,11 @@ deploy_branch:
   before_script:
     - mkdir -p /root/.kube/
   script:
-    - echo "$KUBE_CONFIG" | base64 -d > "$KUBECONFIG"
-    - chmod 0600 "$KUBECONFIG"
+    - echo ${KUBE_CONFIG} | base64 -d > ${KUBECONFIG}
+    - chmod 0600 ${KUBECONFIG}
     - helm upgrade --install diplom ./helm/nginx-feniks --set containers.tag=${BRANCH_TAG}
   rules:
-    - if: ('$CI_COMMIT_BRANCH != "main"' && $CI_COMMIT_TAG)
+    - if: (${CI_COMMIT_BRANCH} != "main" && $CI_COMMIT_TAG)
   when: manual
   dependencies:
     - build_branch_tag
\ No newline at end of file