Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -22,7 +22,6 @@ stages:
 
 variables:
   DOCKER_HOST: tcp://docker:2375
-  DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
 
 build-docker-image:
@@ -31,38 +30,29 @@ build-docker-image:
   services:
     - docker:dind
   before_script:
-    - docker info
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+    - echo "$DOCKER_PW" | docker login -u "$DOCKER_USER" --password-stdin "$DOCKER_REPO"
   script:
-    - >
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-        tag="latest";
-      else
-        tag="$CI_COMMIT_REF_SLUG";
-      fi
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$tag" .
-    - docker push "$CI_REGISTRY_IMAGE:$tag"
-  rules:
-    - exists:
-        - Dockerfile
+    - docker build -t "$DOCKER_REPO/$PROJECT:$CI_COMMIT_REF_SLUG" .
+    - docker push "$DOCKER_REPO/$PROJECT:$CI_COMMIT_REF_SLUG"
+  only:
+    - branches
 
 deploy-to-bw-cloud:
-  image: alpine:latest
   stage: deploy
+  image: alpine:latest
   before_script:
-    - apk add --no-cache sshpass
+    - apk add --no-cache openssh-client
+    - mkdir -p ~/.ssh
+    - echo "$BW_CLOUD_SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+    - chmod 600 ~/.ssh/id_rsa
+    - ssh-keyscan -H "$BW_CLOUD_IP" >> ~/.ssh/known_hosts
   script:
     - >
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-        tag="latest";
-      else
-        tag="$CI_COMMIT_REF_SLUG";
-      fi
-    - sshpass -p "$BW_CLOUD_PASSWORD" ssh -o StrictHostKeyChecking=no "$BW_CLOUD_USER@$BW_CLOUD_HOST" "
-        docker pull $CI_REGISTRY_IMAGE:$tag &&
-        docker stop flask-container || true &&
-        docker rm flask-container || true &&
-        docker run -d --name flask-container -p 5001:5000 $CI_REGISTRY_IMAGE:$tag
+      ssh "$BW_CLOUD_USER@$BW_CLOUD_IP" "
+      docker pull $DOCKER_REPO/$PROJECT:$CI_COMMIT_REF_SLUG &&
+      docker stop flask-container || true &&
+      docker rm flask-container || true &&
+      docker run -d --name flask-container -p 5001:5000 $DOCKER_REPO/$PROJECT:$CI_COMMIT_REF_SLUG
       "
   only:
     - main