From dd991c7a98e388792a53fded9085d0d95abee1a9 Mon Sep 17 00:00:00 2001
From: "dorian.hodin" <Dorian/2020>
Date: Tue, 21 Mar 2023 11:24:13 +0100
Subject: [PATCH] Try to deploy app 2

---
 .drone.yml                      | 6 +++---
 Dockerfile => Source/Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename Dockerfile => Source/Dockerfile (75%)

diff --git a/.drone.yml b/.drone.yml
index fee0e16..61130a3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,8 +11,8 @@ steps:
   - name: app-image
     image: plugins/docker
     settings:
-      dockerfile: Dockerfile
-      context: ./Source/
+      dockerfile: ./Source/Dockerfile
+      context: Source
       registry: hub.codefirst.iut.uca.fr
       repo: hub.codefirst.iut.uca.fr/dorian.hodin/sae4.01_formulaire
       username:
@@ -38,7 +38,7 @@ steps:
       SONAR_TOKEN:
         from_secret: SONARQ_TOKEN
     commands:
-      - curl https://codefirst.iut.uca.fr/containers/Temoignages-app-image/Source/coverage.xml -o /drone/src/coverage.xml
+      - curl https://codefirst.iut.uca.fr/containers/Temoignages-app-image/coverage.xml -o /drone/src/coverage.xml
       - sonar-scanner -Dsonar.projectKey=SAE4.01_FORMULAIRE 
                       -Dsonar.sources=.
                       -Dsonar.inclusions=**/*.php
diff --git a/Dockerfile b/Source/Dockerfile
similarity index 75%
rename from Dockerfile
rename to Source/Dockerfile
index 64bc003..34f2a78 100644
--- a/Dockerfile
+++ b/Source/Dockerfile
@@ -1,9 +1,9 @@
 FROM php:8.1-apache
 RUN apt-get update && apt-get install -y git zip
-COPY Source /var/www/html
-WORKDIR /var/www/html/Source/Config
+COPY . /var/www/html
+WORKDIR /var/www/html/Config
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 RUN composer update && composer install
-WORKDIR /var/www/html/Source
+WORKDIR /var/www/html
 RUN Config/vendor/bin/phpunit .\Tests --coverage-clover coverage.xml