test4

.gitlab-ci.yml

@@ -6,8 +6,6 @@ stages:
 
 variables:
   DOCKER_REGISTRY: "docker.io"
-  DOCKER_USERNAME: "$DOCKERHUB_USER"  # c'est dans gitlab Setting -> CI -> Variable
-  DOCKER_PASSWORD: "$DOCKERHUB_TOKEN"  # IDEM mais j'ai caché mon token
   IMAGE_BACKEND: "docker.io/benarbause/doodleback-with-quarkus:latest"
   IMAGE_FRONTEND: "docker.io/vuminh224/doodle-frontend:latest"
   APP_REPO: "https://github.com/barais/doodlestudent.git"
@@ -16,9 +14,11 @@ variables:
 check_app_update:
   stage: check
   image: debian:latest
-  before_script:
-    - apt-get update && apt-get install -y git
+  tags:
+    - docker
   script:
+    - apt-get update
+    - apt-get install -y git
     # Récupère le dernier commit distant
     - LATEST_REMOTE=$(git ls-remote $APP_REPO HEAD | awk '{print $1}')
     # Récupère le commit actuel du submodule
@@ -31,18 +31,26 @@ check_app_update:
         echo "NEW_COMMIT=false" >> variables.env
       fi
   artifacts:
-    reports:
-      dotenv: variables.env
+    paths:
+      - variables.env
 
 # Build Frontend (Angular)
 build_frontend:
   stage: build
-  image: node:18
+  image: node:current-alpine3.23
+  tags:
+    - docker
   dependencies:
     - check_app_update
-  rules:
-    - if: '$NEW_COMMIT == "true"'
   script:
+    - apk add --no-cache git
+    - git submodule update --init --recursive
+    - source variables.env || true
+    - if [ "$NEW_COMMIT" != "true" ]; then
+      echo "No new commit, skipping build";
+      exit 0;
+      fi
+    - ls -la doodlestudent/front #test
     - cd doodlestudent/front
     - npm ci
     - npm run build --prod
@@ -57,12 +65,18 @@ build_docker_frontend:
   image: docker:latest
   services:
     - docker:dind
+  tags:
+    - docker
   dependencies:
+    - check_app_update
     - build_frontend
-  rules:
-    - if: '$NEW_COMMIT == "true"'
   script:
-    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+    - source variables.env || true
+    - if [ "$NEW_COMMIT" != "true" ]; then
+      echo "No new commit, skipping build";
+      exit 0;
+      fi
+    - echo "$DOCKERHUB_TOKEN" | docker login -u "$DOCKERHUB_USER" --password-stdin
     - docker build -t "$IMAGE_FRONTEND" doodlestudent/front
     - docker push "$IMAGE_FRONTEND"
     - docker logout
@@ -73,8 +87,7 @@ deploy_production:
   image: alpine:latest
   dependencies:
     - build_docker_frontend
-  rules:
-    - if: '$NEW_COMMIT == "true"'
+    - check_app_update
   before_script:
     - apk add --no-cache openssh-client docker-cli
     - mkdir -p ~/.ssh
@@ -83,13 +96,18 @@ deploy_production:
     - chmod 600 ~/.ssh/id_rsa
     - ssh-keyscan -H "$DEPLOY_SERVER" >> ~/.ssh/known_hosts 2>/dev/null || true
   script:
+    - source variables.env || true
+    - if [ "$NEW_COMMIT" != "true" ]; then
+      echo "No new commit, skipping build";
+      exit 0;
+      fi
     - |
       ssh "$DEPLOY_USER@$DEPLOY_SERVER" << 'EOF'
       cd /app
       docker compose pull
       docker compose up -d
       EOF
-    #environment:
-    #name: production
-    #url: http://127.0.0.1
-  when: manual
+  environment:
+    name: production
+    url: http://148.60.11.130
+  when: manual

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "doodlestudent"]
+	path = doodlestudent
+	url = https://github.com/barais/doodlestudent.git

ansible/playbook.yml

@@ -53,7 +53,6 @@
         port: "{{ http_port }}"
         proto: tcp
 
-
     - name: Install munin
       apt:
         name: