From e5e187d56b2a3c796844800e42d29943550bbe16 Mon Sep 17 00:00:00 2001
From: Louis DUFOUR <louis.dufour@etu.uca.fr>
Date: Fri, 13 Oct 2023 14:07:28 +0200
Subject: [PATCH] =?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 | 48 ++++++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b98ebd8..658888e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,38 +8,31 @@ trigger:
 
 steps:
   - name: Setup
-    image: 'jitesoft/phpunit:latest'
+    image: jitesoft/phpunit:latest
     commands:
-      - >-
-        curl -sS https://getcomposer.org/installer | php --
-        --install-dir=/usr/local/bin --filename=composer
+      - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
       - composer install
 
   - name: test
-    image: 'jitesoft/phpunit:latest'
+    image: jitesoft/phpunit:latest
     commands:
-      - >-
-        vendor/bin/phpunit --filter "/(testCallWebService)( .*)?$/"
-        ./common/Tests/WS_UtilTest.php
-      - >-
-        vendor/bin/phpunit --filter "/(testAllKeysToUppercase)( .*)?$/"
-        ./common/Tests/WS_UtilTest.php
-    depends_on:
-      - Setup
+      - vendor/bin/phpunit --filter "/(testCallWebService)( .*)?$/" ./common/Tests/WS_UtilTest.php
+      - vendor/bin/phpunit --filter "/(testAllKeysToUppercase)( .*)?$/" ./common/Tests/WS_UtilTest.php
+    depends_on: [Setup]   
 
   - name: sonar
-    image: 'sonarsouce/sonar-scanner-cli:5'
-    commands: >-
-      -Dsonar.projectKey=CICD_WebPage_Louis_Duf \ -Dsonar.sources=. \
-      -Dsonar.host.url=https://codefirst.iut.uca.fr/sona
+    image: sonarsouce/sonar-scanner-cli:5
+    commands:
+      - Dsonar.projectKey=CICD_WebPage_Louis_Duf 
+      - Dsonar.sources=. 
+      - Dsonar.host.url=https://codefirst.iut.uca.fr/sona
     settings:
       sonar_token:
         from_secret: SECRET_SONAR_LOGIN
-    depends_on:
-      - Setup
-
+    depends_on: [Setup]   
+  
   - name: hadolint
-    image: 'hadolint/hadolint:latest-alpine'
+    image: hadolint/hadolint:latest-alpine
     commands:
       - hadolint Dockerfile
     depends_on:
@@ -47,7 +40,7 @@ steps:
 
   - name: bluid-docker-image
     image: plugins/docker
-    settings:
+    settings: 
       dockerfile: Dockerfile
       registry: hub.codefirst.iut.uca.fr
       repo: hub.codefirst.iut.uca.fr/louis.dufour/CICD_WebPage
@@ -59,15 +52,14 @@ steps:
       - hadolint
 
   - name: deploy-container
-    image: >-
-      hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
-    environment:
-      IMAGENAME: 'hub.codefirst.iut.uca.fr/louis.dufour/CICD_WebPage:latest'
+    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment: 
+      IMAGENAME: hub.codefirst.iut.uca.fr/louis.dufour/CICD_WebPage:latest
       CONTAINERNAME: phpContainerLouis
       COMMAND: create
       OVERWRITE: true
       CODEFIRST_CLIENTDRONE_ENV_CONTAINER_PATH: louis.dufour-php
-      CODEFIRST_CLIENTDRONE_ENV_LIBRARY_URL: 'https://codefirst.iut.uca.fr/containers/louis.dufour-php'
-      CODEFIRST_CLIENTDRONE_ENV_BACKEND_URL: 'https://codefirst.iut.uca.fr/containers/louis.dufour-php'
+      CODEFIRST_CLIENTDRONE_ENV_LIBRARY_URL: https://codefirst.iut.uca.fr/containers/louis.dufour-php
+      CODEFIRST_CLIENTDRONE_ENV_BACKEND_URL: https://codefirst.iut.uca.fr/containers/louis.dufour-php
     depends_on:
       - docker-build-and-push