From 046b9211133e65a13b1ca7886f398fe555bf13e0 Mon Sep 17 00:00:00 2001
From: David D'ALMEIDA <david.d_almeida@etu.uca.fr>
Date: Mon, 26 Feb 2024 13:40:49 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'.drone.yml'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index fe49e6cf..c5403217 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,23 +1,21 @@
 kind: pipeline
 type: docker
-name: HeartTrack
+name: HeartWave
 
-trigger:
-  branch:
-    - master
-    - merged
+trigger: 
   event:
     - push
 
 steps:
-  
   # Test ✔️
   - name: test
     image: composer:2.6
     commands:
       - cd Sources
+      - rm -r vendor
+      - rm composer.lock
        # Installe les dépendances PHP si nécessaire
-      - composer install --no-interaction
+      - php composer.phar install --no-interaction
       - ./vendor/bin/phpunit tests
 
   # Sonar static code analisis deployment
@@ -38,20 +36,45 @@ steps:
       - cd Sources
       - sonar-scanner -D sonar.projectKey=HeartTrack -D sonar.host.url=https://codefirst.iut.uca.fr/sonar
     depends_on: [ test ]
+  # build image and push on the registry ✔️ 
+  - name: rewrite-urls
+    image: 'busybox:latest'
+    commands:
+      - cd Sources
+      - ls
+      - >-
+        find . -type f -exec sed -i -r
+        "s@(href|src)=\"/@\1=\"$${PLUGIN_CONTAINER_PATH}@g" {} +                
+    settings:
+      container_path: https://codefirst.iut.uca.fr/containers/HeartDev-web/
 
-  # build image and push on the registry ✔️        
   - name: docker-build-and-push
     image: plugins/docker
     settings:
+      commands: ls
       dockerfile: Sources/config/Dockerfile
       context: Sources
       registry: hub.codefirst.iut.uca.fr
       repo: hub.codefirst.iut.uca.fr/david.d_almeida/web
+      mirror: https://proxy.iut.uca.fr:8443
       username:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
         from_secret: SECRET_REGISTRY_PASSWORD
-      git_auth: true
+    depends_on:
+      - rewrite-urls
+
+  - name: deploy-container
+    image: >-
+      hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment:
+      IMAGENAME: 'hub.codefirst.iut.uca.fr/david.d_almeida/web:latest'
+      CONTAINERNAME: web
+      COMMAND: create
+      OVERWRITE: true
+      ADMINS: david.d_almeida
+    depends_on:
+      - docker-build-and-push
 
   - name: notify
     image: ruby:2.1

From 371d6088f63fdab2f3e10969956437ff972f5922 Mon Sep 17 00:00:00 2001
From: David D'ALMEIDA <david.d_almeida@etu.uca.fr>
Date: Mon, 26 Feb 2024 13:42:44 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'.drone.yml'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c5403217..fe49e6cf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,21 +1,23 @@
 kind: pipeline
 type: docker
-name: HeartWave
+name: HeartTrack
 
-trigger: 
+trigger:
+  branch:
+    - master
+    - merged
   event:
     - push
 
 steps:
+  
   # Test ✔️
   - name: test
     image: composer:2.6
     commands:
       - cd Sources
-      - rm -r vendor
-      - rm composer.lock
        # Installe les dépendances PHP si nécessaire
-      - php composer.phar install --no-interaction
+      - composer install --no-interaction
       - ./vendor/bin/phpunit tests
 
   # Sonar static code analisis deployment
@@ -36,45 +38,20 @@ steps:
       - cd Sources
       - sonar-scanner -D sonar.projectKey=HeartTrack -D sonar.host.url=https://codefirst.iut.uca.fr/sonar
     depends_on: [ test ]
-  # build image and push on the registry ✔️ 
-  - name: rewrite-urls
-    image: 'busybox:latest'
-    commands:
-      - cd Sources
-      - ls
-      - >-
-        find . -type f -exec sed -i -r
-        "s@(href|src)=\"/@\1=\"$${PLUGIN_CONTAINER_PATH}@g" {} +                
-    settings:
-      container_path: https://codefirst.iut.uca.fr/containers/HeartDev-web/
 
+  # build image and push on the registry ✔️        
   - name: docker-build-and-push
     image: plugins/docker
     settings:
-      commands: ls
       dockerfile: Sources/config/Dockerfile
       context: Sources
       registry: hub.codefirst.iut.uca.fr
       repo: hub.codefirst.iut.uca.fr/david.d_almeida/web
-      mirror: https://proxy.iut.uca.fr:8443
       username:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
         from_secret: SECRET_REGISTRY_PASSWORD
-    depends_on:
-      - rewrite-urls
-
-  - name: deploy-container
-    image: >-
-      hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
-    environment:
-      IMAGENAME: 'hub.codefirst.iut.uca.fr/david.d_almeida/web:latest'
-      CONTAINERNAME: web
-      COMMAND: create
-      OVERWRITE: true
-      ADMINS: david.d_almeida
-    depends_on:
-      - docker-build-and-push
+      git_auth: true
 
   - name: notify
     image: ruby:2.1