building ecr image dynamically

Author: epten08

.github/workflows/node-api-cicd.yml

@@ -107,17 +107,16 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: ${{ env.AWS_REGION }}
-          ECR_REGISTRY: ${{ needs.build-and-push.outputs.ecr_registry }}
-          API_IMAGE: ${{ needs.build-and-push.outputs.image_uri }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
           VPS_DEPLOY_PATH: ${{ env.VPS_DEPLOY_PATH }}
           APP_ENV_B64: ${{ secrets.APP_ENV_B64 }}
+          ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
         with:
           host: ${{ secrets.VPS_HOST }}
           username: ${{ secrets.VPS_USER }}
           key: ${{ secrets.VPS_SSH_KEY }}
           port: ${{ secrets.VPS_PORT || 22 }}
-          envs: AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AWS_REGION,ECR_REGISTRY,API_IMAGE,VPS_DEPLOY_PATH,APP_ENV_B64
+          envs: AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AWS_REGION,VPS_DEPLOY_PATH,APP_ENV_B64,ECR_REPOSITORY
           script: |
             set -e
             command -v docker >/dev/null 2>&1 || { echo "docker is not installed"; exit 1; }
@@ -132,10 +131,13 @@ jobs:
             fi
             printf "%s" "$APP_ENV_B64" | base64 -d > .env
             docker logout 2>/dev/null || true
-            echo "Logging into ECR: $ECR_REGISTRY"
             export AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID"
             export AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY"
             export AWS_REGION="$AWS_REGION"
+            AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+            ECR_REGISTRY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
+            API_IMAGE="${ECR_REGISTRY}/${ECR_REPOSITORY}:latest"
+            echo "Logging into ECR: $ECR_REGISTRY"
             aws ecr get-login-password --region "$AWS_REGION" | docker login --username AWS --password-stdin "$ECR_REGISTRY"
             echo "ECR login exit code: $?"
             echo "Pulling postgres image..."