From eaa4d1c23bb0763f5d55979f3a98d6fe91193df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B0=D0=B8=D0=B4=20=D0=9E=D0=BC=D0=B0=D1=80=20?=
 =?UTF-8?q?=D0=9C=D0=B5=D0=B4=D1=85=D0=B0=D1=82?= <o.zaid@ecosoft.group>
Date: Sun, 14 Dec 2025 00:19:34 +0500
Subject: [PATCH] f

---
 .gitlab-ci.yml            | 24 +-----------------------
 docker-compose.server.yml |  5 ++++-
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbcda07..ee5b230 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,6 @@
 stages:
-  - build
   - deploy
 
-variables:
-  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
-  IMAGE_TAG_LATEST: $CI_REGISTRY_IMAGE:latest
-
-build_and_push:
-  stage: build
-  image: docker:29
-  variables:
-    DOCKER_HOST: unix:///var/run/docker.sock
-  rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-  script:
-    - test -n "$CI_REGISTRY" -a -n "$CI_REGISTRY_IMAGE" || (echo "GitLab Container Registry is not enabled/configured for this project." && exit 1)
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-    - docker build --target production -t "$IMAGE_TAG" -t "$IMAGE_TAG_LATEST" .
-    - docker push "$IMAGE_TAG"
-    - docker push "$IMAGE_TAG_LATEST"
-
 deploy_production:
   stage: deploy
   image: alpine:3.20
@@ -46,7 +27,4 @@ deploy_production:
         --exclude='coverage' \
         --exclude='dist' \
         ./ "$DEPLOY_USER@$DEPLOY_HOST:/opt/apps/api-finance/"
-    - test -n "$CI_REGISTRY" -a -n "$CI_REGISTRY_IMAGE" || (echo "GitLab Container Registry is not enabled/configured for this project." && exit 1)
-    - ssh "$DEPLOY_USER@$DEPLOY_HOST" "echo '$CI_REGISTRY_PASSWORD' | docker login -u '$CI_REGISTRY_USER' --password-stdin '$CI_REGISTRY'"
-    - ssh "$DEPLOY_USER@$DEPLOY_HOST" "cd /opt/apps/api-finance && APP_IMAGE='$IMAGE_TAG' docker compose -f docker-compose.server.yml pull"
-    - ssh "$DEPLOY_USER@$DEPLOY_HOST" "cd /opt/apps/api-finance && APP_IMAGE='$IMAGE_TAG' docker compose -f docker-compose.server.yml up -d"
+    - ssh "$DEPLOY_USER@$DEPLOY_HOST" "cd /opt/apps/api-finance && docker compose -f docker-compose.server.yml up -d --build"
diff --git a/docker-compose.server.yml b/docker-compose.server.yml
index 17abf67..e92e07c 100644
--- a/docker-compose.server.yml
+++ b/docker-compose.server.yml
@@ -21,7 +21,10 @@ services:
     restart: unless-stopped
 
   app:
-    image: ${APP_IMAGE}
+    build:
+      context: .
+      dockerfile: Dockerfile
+      target: production
     container_name: api_finance_app
     environment:
       NODE_ENV: production