From d7385ae0046a22595dbacc8fa3d7e3205c5c961d Mon Sep 17 00:00:00 2001
From: mohamed menacer <mohamed.menacer@etu.univ-amu.fr>
Date: Thu, 27 Feb 2025 11:04:43 +0100
Subject: [PATCH] 27 edition

---
 .gitlab-ci.yml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c96dd13..ce8eead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,36 +2,42 @@ image: docker:latest
 
 services:
   - name: docker:dind
-    command: ["--tls=false"]
     entrypoint: ["/bin/sh", "-c"]
+    command: ["dockerd-entrypoint.sh --tls=false --host tcp://0.0.0.0:2375"]
     privileged: true
 
 variables:
   DOCKER_HOST: "tcp://docker:2375"
   DOCKER_TLS_CERTDIR: ""
+  DOCKER_DRIVER: "overlay2"
 
 before_script:
+  - echo "🔧 Vérification de Docker"
+  - docker version
   - docker info
 
 stages:
   - build
+  - test
   - deploy
 
 build:
   stage: build
   script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
-    - docker build -t $CI_REGISTRY/m24024310/devops_mohi/php_app:latest ./app
-    - docker tag $CI_REGISTRY/m24024310/devops_mohi/php_app:latest $CI_REGISTRY/m24024310/devops_mohi/php_app:$CI_COMMIT_SHORT_SHA
-    - docker logout
+    - echo "🚀 Construction de l'image Docker..."
+    - docker build -t my-app:latest .
+
+test:
+  stage: test
+  script:
+    - echo "🧪 Lancement des tests..."
+    - docker run --rm my-app:latest pytest
 
 deploy:
   stage: deploy
   script:
-    - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
-    - docker push $CI_REGISTRY/m24024310/devops_mohi/php_app:latest
-    - docker push $CI_REGISTRY/m24024310/devops_mohi/php_app:$CI_COMMIT_SHORT_SHA
-    - docker logout
-  only:
-    - main
+    - echo "📦 Déploiement en cours..."
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+    - docker tag my-app:latest "$CI_REGISTRY_IMAGE:latest"
+    - docker push "$CI_REGISTRY_IMAGE:latest"
 
-- 
GitLab