From fbcbe958f1bd1db499f225f1a2cee0b4b02d7c1f Mon Sep 17 00:00:00 2001
From: namdh <namdh861@gmail.com>
Date: Sun, 13 Sep 2026 18:33:54 +0700
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2fd1d3..84db383 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,9 @@ stages:
   - deploy
 
 variables:
-  IMAGE_SHA: "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
-  IMAGE_LATEST: "$CI_REGISTRY_IMAGE:latest"
+  DOCKERHUB_REPO: "mws-api"
   CONTAINER_NAME: "mws-api"
-  HOST_PORT: "2000"
+  HOST_PORT: "8080"
   CONTAINER_PORT: "8080"
   DEPLOY_SSH_PORT: "8686"
   ASPNETCORE_ENVIRONMENT: "Production"
@@ -25,17 +24,17 @@ workflow:
 build:
   stage: build
   script:
-    - echo "Build image $IMAGE_SHA và $IMAGE_LATEST"
-    - docker build -t "$IMAGE_SHA" -t "$IMAGE_LATEST" .
+    - IMAGE_BASE="$REGISTRY_USER/$DOCKERHUB_REPO"
+    - docker build -t "$IMAGE_BASE:$CI_COMMIT_SHORT_SHA" -t "$IMAGE_BASE:latest" .
 
 push:
   stage: push
   script:
-    - 'echo "user_len=${#REGISTRY_USER} pass_len=${#REGISTRY_PASSWORD} is_file=$([ -f "$REGISTRY_PASSWORD" ] && echo yes || echo no)"'
-    - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-    - docker push "$IMAGE_SHA"
-    - docker push "$IMAGE_LATEST"
-    - docker logout "$CI_REGISTRY"
+    - IMAGE_BASE="$REGISTRY_USER/$DOCKERHUB_REPO"
+    - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin
+    - docker push "$IMAGE_BASE:$CI_COMMIT_SHORT_SHA"
+    - docker push "$IMAGE_BASE:latest"
+    - docker logout
 
 deploy:
   stage: deploy
@@ -49,11 +48,12 @@ deploy:
     - ssh-keyscan -p "$DEPLOY_SSH_PORT" -H "$DEPLOYER_HOST" >> ~/.ssh/known_hosts 2>/dev/null
     - chmod 644 ~/.ssh/known_hosts
   script:
+    - IMAGE_BASE="$REGISTRY_USER/$DOCKERHUB_REPO"
     - ENV_FILE="/home/$DEPLOYER_USER/apps/$CI_PROJECT_NAME/.env"
-    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "echo '$REGISTRY_PASSWORD' | docker login -u '$REGISTRY_USER' --password-stdin '$CI_REGISTRY'"
-    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker pull '$IMAGE_SHA'"
+    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "echo '$REGISTRY_PASSWORD' | docker login -u '$REGISTRY_USER' --password-stdin"
+    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker pull '$IMAGE_BASE:$CI_COMMIT_SHORT_SHA'"
     - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker stop '$CONTAINER_NAME' 2>/dev/null || true"
     - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker rm '$CONTAINER_NAME' 2>/dev/null || true"
     - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "test -f '$ENV_FILE' || { echo \"Thiếu $ENV_FILE trên server\"; exit 1; }"
-    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker run -d --name '$CONTAINER_NAME' --restart unless-stopped --env-file '$ENV_FILE' -e ASPNETCORE_ENVIRONMENT='$ASPNETCORE_ENVIRONMENT' -p '$HOST_PORT:$CONTAINER_PORT' '$IMAGE_SHA'"
-    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker logout '$CI_REGISTRY'"
+    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker run -d --name '$CONTAINER_NAME' --restart unless-stopped --env-file '$ENV_FILE' -e ASPNETCORE_ENVIRONMENT='$ASPNETCORE_ENVIRONMENT' -p '$HOST_PORT:$CONTAINER_PORT' '$IMAGE_BASE:$CI_COMMIT_SHORT_SHA'"
+    - ssh -p "$DEPLOY_SSH_PORT" "$DEPLOYER_USER@$DEPLOYER_HOST" "docker logout"