From c3fe092100ee1c704e0314a0eba6195e53e28abb Mon Sep 17 00:00:00 2001
From: "lucas.landrecy" <lucas.landrecy@etu.hesge.ch>
Date: Sun, 25 May 2025 08:59:51 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6a0afd..1180dc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,21 @@
 stages:
   - build
   - push
+  - deploy
 
 variables:
-  CLIENT_IMAGE: $DOCKER_REGISTRY/$DOCKER_REPO_NAMESPACE/client:$CI_COMMIT_SHORT_SHA
-  NEO4J_IMAGE: $DOCKER_REGISTRY/$DOCKER_REPO_NAMESPACE/neo4j:$CI_COMMIT_SHORT_SHA
+  DOCKER_DRIVER: overlay2
+  CLIENT_IMAGE: $CI_REGISTRY_IMAGE/client:$CI_COMMIT_SHORT_SHA
+  NEO4J_IMAGE: $CI_REGISTRY_IMAGE/neo4j:$CI_COMMIT_SHORT_SHA
 
 .default-docker-job:
   image: docker:24.0
   services:
     - docker:24.0-dind
   before_script:
-    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" $DOCKER_REGISTRY
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
+# Build both images
 build_client:
   extends: .default-docker-job
   stage: build
@@ -25,6 +28,7 @@ build_neo4j:
   script:
     - docker build -t $NEO4J_IMAGE ./neo4j
 
+# Push both images
 push_client:
   extends: .default-docker-job
   stage: push
@@ -38,3 +42,18 @@ push_neo4j:
   script:
     - docker push $NEO4J_IMAGE
   needs: [build_neo4j]
+
+# Optional deployment (e.g., via kubectl or Helm)
+# deploy:
+#   stage: deploy
+#   image:
+#     name: bitnami/kubectl:latest
+#     entrypoint: [""]
+#   script:
+#     - echo "$KUBECONFIG" > kubeconfig.yaml
+#     - export KUBECONFIG=$CI_PROJECT_DIR/kubeconfig.yaml
+#     - kubectl set image deployment/client client-container=$CLIENT_IMAGE --namespace=mon-namespace
+#     - kubectl set image deployment/neo4j neo4j-container=$NEO4J_IMAGE --namespace=mon-namespace
+#   only:
+#     - main
+#   needs: [push_client, push_neo4j]
-- 
GitLab