From 1c13a770cd09b7adb671926f3b9afc9cf8521b06 Mon Sep 17 00:00:00 2001
From: Alexis1663 <92861778+Alexis1663@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:49:04 +0200
Subject: [PATCH] :bug: fix: CD

---
 .drone.yml        |  4 ++--
 Dockerfile        | 11 -----------
 docker/.htaccess  |  4 ++++
 docker/Dockerfile |  4 ++++
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 Dockerfile
 create mode 100644 docker/.htaccess
 create mode 100644 docker/Dockerfile

diff --git a/.drone.yml b/.drone.yml
index f2f5c3c..1283849 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ steps:
   - name: docker-build-and-push
     image: plugins/docker
     settings:
-      dockerfile: Dockerfile
+      dockerfile: ./docker/Dockerfile
       context: .
       registry: hub.codefirst.iut.uca.fr
       repo: hub.codefirst.iut.uca.fr/alexis.carreau/Portfolio
@@ -23,7 +23,7 @@ steps:
   - name: deploy-container
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
     environment:
-      IMAGENAME: hub.codefirst.iut.uca.fr/alexis.carreau/Portfolio:1.0
+      IMAGENAME: hub.codefirst.iut.uca.fr/alexis.carreau/portfolio:1.0
       CONTAINERNAME: portfolio
       COMMAND: create
       OVERWRITE: true
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 98e8774..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-# Utilise l'image de base de Nginx
-FROM nginx:alpine
-
-# Copie le contenu de ton site web dans le répertoire par défaut de Nginx
-COPY docker /usr/share/nginx/html
-
-# Expose le port 80 pour que le serveur web soit accessible
-EXPOSE 80
-
-# Commande par défaut pour lancer Nginx en mode non-démon
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/docker/.htaccess b/docker/.htaccess
new file mode 100644
index 0000000..aa5afc1
--- /dev/null
+++ b/docker/.htaccess
@@ -0,0 +1,4 @@
+<Files *>
+	Order Allow,Deny
+	Deny from All
+</Files>
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..b150ef5
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,4 @@
+FROM php:8.0-apache as base
+COPY . /var/www/html/
+WORKDIR /var/www/html/
+EXPOSE 80
\ No newline at end of file