From f3d71cbb43c2269f45d5a35c74a1baaf51348d70 Mon Sep 17 00:00:00 2001
From: Thatsaphorn Atchariyaphap <thatsaphorn@outlook.de>
Date: Fri, 2 May 2025 10:17:15 +0200
Subject: [PATCH] Refactor GitLab CI pipeline paths and dependencies

---
 backend/.gitlab-ci.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/backend/.gitlab-ci.yml b/backend/.gitlab-ci.yml
index 21fa3ec..22833c6 100644
--- a/backend/.gitlab-ci.yml
+++ b/backend/.gitlab-ci.yml
@@ -1,19 +1,15 @@
 stages:
   - backend_build
-  - dockerize
 
 variables:
   REGISTRY: registry.gitlab.com/rheinsw/$CI_PROJECT_PATH
   TAG: $CI_COMMIT_REF_SLUG
 
-default:
-  before_script:
-    - cd backend
-
 backend_build_job:
   stage: backend_build
   image: maven:3.9.9-eclipse-temurin-21@sha256:2e3824afeb41f61761adee95318814e6669bd59aaf61255b2af47064b8755c02
   script:
+    - cd backend
     - mvn package
   artifacts:
     paths:
@@ -26,7 +22,7 @@ backend_build_job:
 build_shared_base_image:
   stage: dockerize
   script:
-    - docker build -f Dockerfile.base -t $REGISTRY/shared-base:$TAG .
+    - docker build -f backend/Dockerfile.base -t $REGISTRY/shared-base:$TAG .
     - docker push $REGISTRY/shared-base:$TAG
   needs:
     - backend_build_job
@@ -34,7 +30,7 @@ build_shared_base_image:
 build_gateway_image:
   stage: dockerize
   script:
-    - docker build --build-arg JAR_FILE=backend/gateway/target/gateway-*.jar -f Dockerfile.service -t $REGISTRY/gateway:$TAG .
+    - docker build --build-arg JAR_FILE=backend/gateway/target/gateway-*.jar -f backend/Dockerfile.service -t $REGISTRY/gateway:$TAG .
     - docker push $REGISTRY/gateway:$TAG
   needs:
     - backend_build_job
@@ -43,8 +39,8 @@ build_gateway_image:
 build_discovery_image:
   stage: dockerize
   script:
-    - docker build --build-arg JAR_FILE=backend/discoveryServer/target/discoveryServer-*.jar -f Dockerfile.service -t $REGISTRY/discovery-server:$TAG .
+    - docker build --build-arg JAR_FILE=backend/discoveryServer/target/discoveryServer-*.jar -f backend/Dockerfile.service -t $REGISTRY/discovery-server:$TAG .
     - docker push $REGISTRY/discovery-server:$TAG
   needs:
     - backend_build_job
-    - build_shared_base_image
+    - build_shared_base_image
\ No newline at end of file