From 6512edd041ab71612cbf4af6f568e1026b3b531c Mon Sep 17 00:00:00 2001 From: balex Date: Fri, 27 Feb 2026 22:05:44 +0100 Subject: [PATCH] icon --- .gitlab-ci.yml | 60 +++++++++++++++++++++++++--------------- rag-view/.env.production | 1 - rag-view/vite.config.js | 7 ++++- 3 files changed, 44 insertions(+), 24 deletions(-) delete mode 100644 rag-view/.env.production diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 749047b..d0bd123 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,9 +26,9 @@ build-rag: - rag-service/target/*.jar expire_in: 1h rules: - - changes: - - rag-service/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - rag-service/**/* build-gateway: stage: build @@ -46,9 +46,9 @@ build-gateway: - gateway-service/target/*.jar expire_in: 1h rules: - - changes: - - gateway-service/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - gateway-service/**/* build-analytics: stage: build @@ -66,9 +66,9 @@ build-analytics: - analytics-service/target/*.jar expire_in: 1h rules: - - changes: - - analytics-service/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - analytics-service/**/* build-rag-view: stage: build @@ -86,9 +86,9 @@ build-rag-view: - rag-view/dist expire_in: 1h rules: - - changes: - - rag-view/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - rag-view/**/* # ══════════════════════════════════════════════════════════ # PUBLISH DOCKER IMAGES @@ -109,9 +109,9 @@ publish-rag: - docker push $REGISTRY/rag-service:latest needs: [build-rag] rules: - - changes: - - rag-service/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - rag-service/**/* publish-gateway: stage: publish @@ -128,9 +128,9 @@ publish-gateway: - docker push $REGISTRY/gateway-service:latest needs: [build-gateway] rules: - - changes: - - gateway-service/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - gateway-service/**/* publish-analytics: stage: publish @@ -147,9 +147,9 @@ publish-analytics: - docker push $REGISTRY/analytics-service:latest needs: [build-analytics] rules: - - changes: - - analytics-service/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - analytics-service/**/* publish-rag-view: stage: publish @@ -166,9 +166,9 @@ publish-rag-view: - docker push $REGISTRY/rag-view:latest needs: [build-rag-view] rules: - - changes: - - rag-view/**/* - if: $CI_COMMIT_BRANCH == "main" + changes: + - rag-view/**/* # ══════════════════════════════════════════════════════════ # DEPLOY TO VPS @@ -177,8 +177,6 @@ publish-rag-view: .deploy_template: &deploy_setup stage: deploy image: alpine:3.20 - only: - - main before_script: - apk add --no-cache openssh-client - mkdir -p ~/.ssh @@ -192,6 +190,10 @@ publish-rag-view: deploy-rag: <<: *deploy_setup needs: [publish-rag] + rules: + - if: $CI_COMMIT_BRANCH == "main" + changes: + - rag-service/**/* script: - | ssh $VPS_USER@$VPS_HOST << ENDSSH @@ -207,6 +209,10 @@ deploy-rag: deploy-gateway: <<: *deploy_setup needs: [publish-gateway] + rules: + - if: $CI_COMMIT_BRANCH == "main" + changes: + - gateway-service/**/* script: - | ssh $VPS_USER@$VPS_HOST << ENDSSH @@ -222,6 +228,10 @@ deploy-gateway: deploy-analytics: <<: *deploy_setup needs: [publish-analytics] + rules: + - if: $CI_COMMIT_BRANCH == "main" + changes: + - analytics-service/**/* script: - | ssh $VPS_USER@$VPS_HOST << ENDSSH @@ -233,10 +243,14 @@ deploy-analytics: docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d analytics-service docker image prune -af ENDSSH - + deploy-rag-view: <<: *deploy_setup needs: [publish-rag-view] + rules: + - if: $CI_COMMIT_BRANCH == "main" + changes: + - rag-view/**/* script: - | ssh $VPS_USER@$VPS_HOST << ENDSSH @@ -247,13 +261,15 @@ deploy-rag-view: docker compose -f docker-compose.yml -f docker-compose.prod.yml pull rag-view docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d rag-view docker image prune -af - ENDSSH + ENDSSH # Deploy all services at once (manual trigger) deploy-all: <<: *deploy_setup - needs: [publish-rag, publish-gateway, publish-analytics] - when: manual + rules: + - if: $CI_COMMIT_BRANCH == "main" + when: manual + needs: [] script: - | ssh $VPS_USER@$VPS_HOST << ENDSSH diff --git a/rag-view/.env.production b/rag-view/.env.production deleted file mode 100644 index a480c93..0000000 --- a/rag-view/.env.production +++ /dev/null @@ -1 +0,0 @@ -VITE_API_BASE_URL=https://balexvic.com \ No newline at end of file diff --git a/rag-view/vite.config.js b/rag-view/vite.config.js index 24b61fe..f9a1040 100644 --- a/rag-view/vite.config.js +++ b/rag-view/vite.config.js @@ -4,4 +4,9 @@ import react from "@vitejs/plugin-react"; export default defineConfig({ plugins: [react()], base: "/ragview/", -}); + define: { + "import.meta.env.VITE_API_BASE_URL": JSON.stringify( + process.env.VITE_API_BASE_URL || "https://balexvic.com" + ), + }, +}); \ No newline at end of file