From 2af201d74ee54c7b301948e0649a4b31606906a1 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:13:08 +0100
Subject: [PATCH 01/68] =?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 | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 6f5bf84..0346621 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,4 +31,32 @@ steps:
     settings:
       sonar_host: https://codefirst.iut.uca.fr/sonar/
       sonar_token:
-        from_secret: SECRET_SONAR_LOGIN_CRYPTIDE
\ No newline at end of file
+        from_secret: SECRET_SONAR_LOGIN_CRYPTIDE
+
+
+
+  - name: container-web
+    image: plugins/docker
+    settings:
+      dockerfile: ./cryptide_project/Dockerfile
+      context: .
+      registry: hub.codefirst.iut.uca.fr
+      repo: hub.codefirst.iut.uca.fr/crypteam/social_graph/web
+      username:
+        from_secret: SECRET_REGISTRY_USERNAME
+      password:
+        from_secret: SECRET_REGISTRY_PASSWORD
+      
+
+
+#container deployment
+  - name: deploy-server-containers
+    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+    environment:
+        IMAGENAME: hub.codefirst.iut.uca.fr/crypteam/social_graph/web:latest
+        CONTAINERNAME: website-crypteam
+        COMMAND: create
+        OVERWRITE: true
+        #PRIVATE: true
+        ADMINS: thomaschazot2,pierreferreira,baptistemarcel
+    depends_on: [ container-web ]

From edda25b6f69a62cf18d31f96cde173f78f3a12c4 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:13:36 +0100
Subject: [PATCH 02/68] Ajouter 'cryptide_project/Dockerfile'

---
 cryptide_project/Dockerfile | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 cryptide_project/Dockerfile

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
new file mode 100644
index 0000000..79eda07
--- /dev/null
+++ b/cryptide_project/Dockerfile
@@ -0,0 +1,29 @@
+# Utilisation d'une image de Node.js avec Alpine Linux comme système d'exploitation de base
+FROM node:14-alpine as builder
+
+# Définir le répertoire de travail dans le conteneur
+WORKDIR /app
+
+# Copier le package.json et le package-lock.json pour installer les dépendances
+COPY package*.json ./
+
+# Installer les dépendances
+RUN npm install --force
+
+# Copier les fichiers du projet dans le conteneur
+COPY . .
+
+# Construire l'application React
+RUN npm run build
+
+# Utiliser une image légère basée sur Nginx pour servir l'application
+FROM nginx:alpine
+
+# Copier les fichiers construits à partir du builder vers le répertoire de travail du serveur Nginx
+COPY --from=builder /app/build /usr/share/nginx/html
+
+# Exposer le port 80 pour le trafic HTTP
+EXPOSE 80
+
+# La commande CMD est utilisée pour démarrer le serveur Nginx lorsque le conteneur démarre
+CMD ["nginx", "-g", "daemon off;"]

From dc4263f7b771d73b7640aeec5a499d50d3b93d0f Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:15:15 +0100
Subject: [PATCH 03/68] =?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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index 0346621..59b7752 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -46,6 +46,7 @@ steps:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
         from_secret: SECRET_REGISTRY_PASSWORD
+    depends_on: [ build ]
       
 
 

From bafdcc4195f92bf8afb7c391703e28e32bd9bfda Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:17:42 +0100
Subject: [PATCH 04/68] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 59b7752..c1391b9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,7 +41,7 @@ steps:
       dockerfile: ./cryptide_project/Dockerfile
       context: .
       registry: hub.codefirst.iut.uca.fr
-      repo: hub.codefirst.iut.uca.fr/crypteam/social_graph/web
+      repo: hub.codefirst.iut.uca.fr/thomas.chazot2/social_graph
       username:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
@@ -54,7 +54,7 @@ steps:
   - name: deploy-server-containers
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
     environment:
-        IMAGENAME: hub.codefirst.iut.uca.fr/crypteam/social_graph/web:latest
+        IMAGENAME: hub.codefirst.iut.uca.fr/thomas.chazot2/social_graph:latest
         CONTAINERNAME: website-crypteam
         COMMAND: create
         OVERWRITE: true

From 24ffe9e137f6b987d419daf6933d60bad8c7a606 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:20:56 +0100
Subject: [PATCH 05/68] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c1391b9..2136cfe 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,7 +41,7 @@ steps:
       dockerfile: ./cryptide_project/Dockerfile
       context: .
       registry: hub.codefirst.iut.uca.fr
-      repo: hub.codefirst.iut.uca.fr/thomas.chazot2/social_graph
+      repo: hub.codefirst.iut.uca.fr/crypteam/cryptide
       username:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
@@ -54,7 +54,7 @@ steps:
   - name: deploy-server-containers
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
     environment:
-        IMAGENAME: hub.codefirst.iut.uca.fr/thomas.chazot2/social_graph:latest
+        IMAGENAME: hub.codefirst.iut.uca.fr/crypteam/cryptide:latest
         CONTAINERNAME: website-crypteam
         COMMAND: create
         OVERWRITE: true

From 941933fe786f0d15a351c8e6efae82bf18606f7b Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:21:11 +0100
Subject: [PATCH 06/68] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 2136cfe..c022915 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -46,7 +46,7 @@ steps:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
         from_secret: SECRET_REGISTRY_PASSWORD
-    depends_on: [ build ]
+    #depends_on: [ build ]
       
 
 

From ea37b201ef9625037d2d138b82ac3c2e7d022a82 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:23:43 +0100
Subject: [PATCH 07/68] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c022915..82739e2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,7 +41,7 @@ steps:
       dockerfile: ./cryptide_project/Dockerfile
       context: .
       registry: hub.codefirst.iut.uca.fr
-      repo: hub.codefirst.iut.uca.fr/crypteam/cryptide
+      repo: hub.codefirst.iut.uca.fr/crypteam/cryptide/web
       username:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
@@ -54,7 +54,7 @@ steps:
   - name: deploy-server-containers
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
     environment:
-        IMAGENAME: hub.codefirst.iut.uca.fr/crypteam/cryptide:latest
+        IMAGENAME: hub.codefirst.iut.uca.fr/crypteam/cryptide/web:latest
         CONTAINERNAME: website-crypteam
         COMMAND: create
         OVERWRITE: true

From d5dfecd8e201e41650f808ae9986a479dce9fd72 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:25:48 +0100
Subject: [PATCH 08/68] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 82739e2..5325564 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,7 +41,7 @@ steps:
       dockerfile: ./cryptide_project/Dockerfile
       context: .
       registry: hub.codefirst.iut.uca.fr
-      repo: hub.codefirst.iut.uca.fr/crypteam/cryptide/web
+      repo: hub.codefirst.iut.uca.fr/thomas.chazot2/cryptide/web
       username:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
@@ -54,7 +54,7 @@ steps:
   - name: deploy-server-containers
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
     environment:
-        IMAGENAME: hub.codefirst.iut.uca.fr/crypteam/cryptide/web:latest
+        IMAGENAME: hub.codefirst.iut.uca.fr/thomas.chazot2/cryptide/web:latest
         CONTAINERNAME: website-crypteam
         COMMAND: create
         OVERWRITE: true

From 7b0d111cd1790f2990050acc91ff7e09ccb3e4fd Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:28:29 +0100
Subject: [PATCH 09/68] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 5325564..183c71d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -34,7 +34,7 @@ steps:
         from_secret: SECRET_SONAR_LOGIN_CRYPTIDE
 
 
-
+#
   - name: container-web
     image: plugins/docker
     settings:

From 04b1f84f720c5fa5c7faaa1d48108a51445a83dd Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:32:21 +0100
Subject: [PATCH 10/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 79eda07..594ccfd 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -7,6 +7,8 @@ WORKDIR /app
 # Copier le package.json et le package-lock.json pour installer les dépendances
 COPY package*.json ./
 
+RUN ls ./
+
 # Installer les dépendances
 RUN npm install --force
 

From 32b811a5595d35d74dd18d15149b4b5d6abc7771 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:33:16 +0100
Subject: [PATCH 11/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 594ccfd..2d0dda8 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 # Copier le package.json et le package-lock.json pour installer les dépendances
 COPY package*.json ./
 
-RUN ls ./
+RUN cat package.json
 
 # Installer les dépendances
 RUN npm install --force

From 5fa95390db4d02ac8be10de22d9a43cadac7295a Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:34:13 +0100
Subject: [PATCH 12/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 2d0dda8..09078ff 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -5,7 +5,7 @@ FROM node:14-alpine as builder
 WORKDIR /app
 
 # Copier le package.json et le package-lock.json pour installer les dépendances
-COPY package*.json ./
+COPY package.json ./
 
 RUN cat package.json
 

From 0ec19cf2f47ee7bd0ff5d9381f7295be4138f296 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:35:28 +0100
Subject: [PATCH 13/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 09078ff..74ed9ad 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -7,8 +7,6 @@ WORKDIR /app
 # Copier le package.json et le package-lock.json pour installer les dépendances
 COPY package.json ./
 
-RUN cat package.json
-
 # Installer les dépendances
 RUN npm install --force
 

From 59428e266588f37f480bbcb0d2d14a3052ba7411 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:35:59 +0100
Subject: [PATCH 14/68] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 183c71d..acf27b6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,7 +39,7 @@ steps:
     image: plugins/docker
     settings:
       dockerfile: ./cryptide_project/Dockerfile
-      context: .
+      context: ./cryptide_project
       registry: hub.codefirst.iut.uca.fr
       repo: hub.codefirst.iut.uca.fr/thomas.chazot2/cryptide/web
       username:

From 2e55fb162028e43cdbb7481a55ea43d9cb3903c6 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:40:51 +0100
Subject: [PATCH 15/68] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index acf27b6..4fea219 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -55,7 +55,7 @@ steps:
     image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
     environment:
         IMAGENAME: hub.codefirst.iut.uca.fr/thomas.chazot2/cryptide/web:latest
-        CONTAINERNAME: website-crypteam
+        CONTAINERNAME: website
         COMMAND: create
         OVERWRITE: true
         #PRIVATE: true

From 353572942fad9d73740db56baf3e303364acd83a Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:46:46 +0100
Subject: [PATCH 16/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 74ed9ad..e374312 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -5,10 +5,10 @@ FROM node:14-alpine as builder
 WORKDIR /app
 
 # Copier le package.json et le package-lock.json pour installer les dépendances
-COPY package.json ./
+COPY package*.json ./
 
 # Installer les dépendances
-RUN npm install --force
+RUN npm install
 
 # Copier les fichiers du projet dans le conteneur
 COPY . .
@@ -16,14 +16,20 @@ COPY . .
 # Construire l'application React
 RUN npm run build
 
-# Utiliser une image légère basée sur Nginx pour servir l'application
-FROM nginx:alpine
+# Utiliser une image légère basée sur Node.js pour servir l'application avec serve
+FROM node:14-alpine
 
-# Copier les fichiers construits à partir du builder vers le répertoire de travail du serveur Nginx
-COPY --from=builder /app/build /usr/share/nginx/html
+# Installer serve globalement
+RUN npm install -g serve
+
+# Définir le répertoire de travail dans le conteneur
+WORKDIR /app
+
+# Copier les fichiers construits à partir du builder vers le répertoire de travail du serveur serve
+COPY --from=builder /app/build /app
 
 # Exposer le port 80 pour le trafic HTTP
 EXPOSE 80
 
-# La commande CMD est utilisée pour démarrer le serveur Nginx lorsque le conteneur démarre
-CMD ["nginx", "-g", "daemon off;"]
+# La commande CMD est utilisée pour démarrer serve lorsque le conteneur démarre
+CMD ["serve", "-s", "build", "-p", "80"]

From cbe2388af2bf1da828065c9ea6227f0094f4b52d Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:49:52 +0100
Subject: [PATCH 17/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index e374312..6682e6c 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -31,5 +31,7 @@ COPY --from=builder /app/build /app
 # Exposer le port 80 pour le trafic HTTP
 EXPOSE 80
 
+RUN ls
+
 # La commande CMD est utilisée pour démarrer serve lorsque le conteneur démarre
-CMD ["serve", "-s", "build", "-p", "80"]
+CMD ["serve", "-s", ".", "-p", "80"]

From ffd99b04a347fcfe686fa208794e44007422803d Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:53:01 +0100
Subject: [PATCH 18/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 6682e6c..d465db4 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -29,9 +29,9 @@ WORKDIR /app
 COPY --from=builder /app/build /app
 
 # Exposer le port 80 pour le trafic HTTP
-EXPOSE 80
+EXPOSE 8080
 
 RUN ls
 
 # La commande CMD est utilisée pour démarrer serve lorsque le conteneur démarre
-CMD ["serve", "-s", ".", "-p", "80"]
+CMD ["serve", "-s", ".", "-p", "8080"]

From 04032349e3b89c5ae13b200fe4cae32d7985ad12 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 13:57:12 +0100
Subject: [PATCH 19/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index d465db4..27da4b2 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -34,4 +34,4 @@ EXPOSE 8080
 RUN ls
 
 # La commande CMD est utilisée pour démarrer serve lorsque le conteneur démarre
-CMD ["serve", "-s", ".", "-p", "8080"]
+CMD ["serve", "-s", "-n", ".", "-p", "8080"]

From 092e9e37b99a1179210c65562658f0f5bfee6cba Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:01:40 +0100
Subject: [PATCH 20/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 27da4b2..4ae8e2a 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -31,7 +31,7 @@ COPY --from=builder /app/build /app
 # Exposer le port 80 pour le trafic HTTP
 EXPOSE 8080
 
-RUN ls
+RUN ls static/
 
 # La commande CMD est utilisée pour démarrer serve lorsque le conteneur démarre
 CMD ["serve", "-s", "-n", ".", "-p", "8080"]

From 77decf02d765d3548ea383f2a85b6b30fa8bf6b6 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:07:08 +0100
Subject: [PATCH 21/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 4ae8e2a..d465db4 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -31,7 +31,7 @@ COPY --from=builder /app/build /app
 # Exposer le port 80 pour le trafic HTTP
 EXPOSE 8080
 
-RUN ls static/
+RUN ls
 
 # La commande CMD est utilisée pour démarrer serve lorsque le conteneur démarre
-CMD ["serve", "-s", "-n", ".", "-p", "8080"]
+CMD ["serve", "-s", ".", "-p", "8080"]

From b7a3116d3005b9ec0fbbb2abf60fac0420d42645 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:07:33 +0100
Subject: [PATCH 22/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index d465db4..a14bb5a 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -20,7 +20,7 @@ RUN npm run build
 FROM node:14-alpine
 
 # Installer serve globalement
-RUN npm install -g serve
+RUN npm install serve --force
 
 # Définir le répertoire de travail dans le conteneur
 WORKDIR /app

From 43132a416da141bb39b35dbb9efc73c22f963044 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:10:48 +0100
Subject: [PATCH 23/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index a14bb5a..61506bc 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -19,12 +19,12 @@ RUN npm run build
 # Utiliser une image légère basée sur Node.js pour servir l'application avec serve
 FROM node:14-alpine
 
-# Installer serve globalement
-RUN npm install serve --force
-
 # Définir le répertoire de travail dans le conteneur
 WORKDIR /app
 
+# Installer serve globalement
+RUN npm install serve --force
+
 # Copier les fichiers construits à partir du builder vers le répertoire de travail du serveur serve
 COPY --from=builder /app/build /app
 

From bc4986bf2bbfe1a1881aacf703e294ae7bad274a Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:14:07 +0100
Subject: [PATCH 24/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 61506bc..d465db4 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -19,12 +19,12 @@ RUN npm run build
 # Utiliser une image légère basée sur Node.js pour servir l'application avec serve
 FROM node:14-alpine
 
+# Installer serve globalement
+RUN npm install -g serve
+
 # Définir le répertoire de travail dans le conteneur
 WORKDIR /app
 
-# Installer serve globalement
-RUN npm install serve --force
-
 # Copier les fichiers construits à partir du builder vers le répertoire de travail du serveur serve
 COPY --from=builder /app/build /app
 

From 31a397e6da1ca65063aff400f69f61c87b102d45 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:16:44 +0100
Subject: [PATCH 25/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 42 +++++++++++--------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index d465db4..36b5ddf 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -1,37 +1,19 @@
-# Utilisation d'une image de Node.js avec Alpine Linux comme système d'exploitation de base
-FROM node:14-alpine as builder
+# Fetching the latest node image on alpine linux
+FROM node:alpine AS development
 
-# Définir le répertoire de travail dans le conteneur
-WORKDIR /app
+# Declaring env
+ENV NODE_ENV development
 
-# Copier le package.json et le package-lock.json pour installer les dépendances
-COPY package*.json ./
+# Setting up the work directory
+WORKDIR /react-app
+
+# Installing dependencies
+COPY ./package*.json /react-app
 
-# Installer les dépendances
 RUN npm install
 
-# Copier les fichiers du projet dans le conteneur
+# Copying all the files in our project
 COPY . .
 
-# Construire l'application React
-RUN npm run build
-
-# Utiliser une image légère basée sur Node.js pour servir l'application avec serve
-FROM node:14-alpine
-
-# Installer serve globalement
-RUN npm install -g serve
-
-# Définir le répertoire de travail dans le conteneur
-WORKDIR /app
-
-# Copier les fichiers construits à partir du builder vers le répertoire de travail du serveur serve
-COPY --from=builder /app/build /app
-
-# Exposer le port 80 pour le trafic HTTP
-EXPOSE 8080
-
-RUN ls
-
-# La commande CMD est utilisée pour démarrer serve lorsque le conteneur démarre
-CMD ["serve", "-s", ".", "-p", "8080"]
+# Starting our application
+CMD ["npm","start]
\ No newline at end of file

From 985fe7bf4e142ed4ec3ec1fcf89734dba1d5c41b Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:19:25 +0100
Subject: [PATCH 26/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 36b5ddf..4a6437d 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -1,19 +1,20 @@
-# Fetching the latest node image on alpine linux
-FROM node:alpine AS development
+# Utilisez une image Node.js comme base
+FROM node:14-alpine
 
-# Declaring env
-ENV NODE_ENV development
+# Définissez le répertoire de travail dans le conteneur
+WORKDIR /app
 
-# Setting up the work directory
-WORKDIR /react-app
-
-# Installing dependencies
-COPY ./package*.json /react-app
+# Copiez le fichier package.json et le fichier package-lock.json dans le répertoire de travail
+COPY package*.json ./
 
+# Installez les dépendances
 RUN npm install
 
-# Copying all the files in our project
+# Copiez tous les fichiers de l'application dans le répertoire de travail
 COPY . .
 
-# Starting our application
-CMD ["npm","start]
\ No newline at end of file
+# Exposez le port 8080
+EXPOSE 8080
+
+# Commande pour exécuter l'application lorsque le conteneur démarre
+CMD ["npm", "start"]

From a5d5ce915c08361f285b32e29d2e6b7fe8ba0a48 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:19:49 +0100
Subject: [PATCH 27/68] Ajouter '. dockerignore'

---
 . dockerignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 . dockerignore

diff --git a/. dockerignore b/. dockerignore
new file mode 100644
index 0000000..5171c54
--- /dev/null
+++ b/. dockerignore	
@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log
\ No newline at end of file

From a9d7a7e020705417c21937d7faaa86a4e03e0beb Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:22:44 +0100
Subject: [PATCH 28/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 4a6437d..ce2b0e9 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -14,7 +14,7 @@ RUN npm install
 COPY . .
 
 # Exposez le port 8080
-EXPOSE 8080
+EXPOSE 80
 
 # Commande pour exécuter l'application lorsque le conteneur démarre
 CMD ["npm", "start"]

From 019fdd1eaaab14249e1d82ad3e74126cac3d5d27 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:26:57 +0100
Subject: [PATCH 29/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/package.json'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/package.json b/cryptide_project/package.json
index abab668..24857de 100644
--- a/cryptide_project/package.json
+++ b/cryptide_project/package.json
@@ -42,7 +42,7 @@
     "web-vitals": "^2.1.4"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "react-scripts start --port 80",
     "build": "react-scripts build",
     "test": "jest --passWithNoTests",
     "eject": "react-scripts eject"

From 851f9f99d5a3da044b785480ca8d252897fe0463 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:29:32 +0100
Subject: [PATCH 30/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/package.json'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/package.json b/cryptide_project/package.json
index 24857de..abab668 100644
--- a/cryptide_project/package.json
+++ b/cryptide_project/package.json
@@ -42,7 +42,7 @@
     "web-vitals": "^2.1.4"
   },
   "scripts": {
-    "start": "react-scripts start --port 80",
+    "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "jest --passWithNoTests",
     "eject": "react-scripts eject"

From c0894b004ef960c67d02e08dc3a7303ce4248b45 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:29:43 +0100
Subject: [PATCH 31/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index ce2b0e9..2534ae1 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -14,7 +14,7 @@ RUN npm install
 COPY . .
 
 # Exposez le port 8080
-EXPOSE 80
+EXPOSE 3000
 
 # Commande pour exécuter l'application lorsque le conteneur démarre
 CMD ["npm", "start"]

From 0667c0e702fdb9929dacd0d682573e5e1e65a666 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:35:08 +0100
Subject: [PATCH 32/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 2534ae1..b9f9df9 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -1,20 +1,31 @@
-# Utilisez une image Node.js comme base
-FROM node:14-alpine
+# Étape 1 : Construire l'application React
+FROM node:14 AS build
 
-# Définissez le répertoire de travail dans le conteneur
 WORKDIR /app
 
-# Copiez le fichier package.json et le fichier package-lock.json dans le répertoire de travail
-COPY package*.json ./
+# Copier le fichier package.json et yarn.lock (ou package-lock.json si vous utilisez npm)
+COPY package.json yarn.lock ./
 
-# Installez les dépendances
-RUN npm install
+# Installer les dépendances
+RUN yarn install
 
-# Copiez tous les fichiers de l'application dans le répertoire de travail
+# Copier le reste des fichiers de l'application
 COPY . .
 
-# Exposez le port 8080
-EXPOSE 3000
+# Construire l'application
+RUN yarn build
 
-# Commande pour exécuter l'application lorsque le conteneur démarre
-CMD ["npm", "start"]
+# Étape 2 : Configurer Nginx et copier les fichiers construits
+FROM nginx:alpine
+
+# Copier les fichiers construits depuis l'étape précédente
+COPY --from=build /app/build /usr/share/nginx/html
+
+# Copier la configuration personnalisée pour Nginx (si nécessaire)
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# Exposer le port 80
+EXPOSE 80
+
+# Commande pour démarrer Nginx lorsqu'un conteneur basé sur cette image est lancé
+CMD ["nginx", "-g", "daemon off;"]

From 809fab5b03219c36f94cd8acb3bdc47d1db1c276 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:35:49 +0100
Subject: [PATCH 33/68] Ajouter 'cryptide_project/nginx.conf'

---
 cryptide_project/nginx.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 cryptide_project/nginx.conf

diff --git a/cryptide_project/nginx.conf b/cryptide_project/nginx.conf
new file mode 100644
index 0000000..231f646
--- /dev/null
+++ b/cryptide_project/nginx.conf
@@ -0,0 +1,15 @@
+server {
+    listen 80;
+    server_name server;
+
+    location / {
+        root /usr/share/nginx/html;
+        index index.html;
+        try_files $uri $uri/ /index.html;
+    }
+
+    error_page 500 502 503 504 /50x.html;
+    location = /50x.html {
+        root /usr/share/nginx/html;
+    }
+}

From 0d7064c1aefe3e252d74ecb0c229349c48f7f26d Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:37:21 +0100
Subject: [PATCH 34/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index b9f9df9..2e977f5 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -4,16 +4,16 @@ FROM node:14 AS build
 WORKDIR /app
 
 # Copier le fichier package.json et yarn.lock (ou package-lock.json si vous utilisez npm)
-COPY package.json yarn.lock ./
+COPY package.json package-lock.json ./
 
 # Installer les dépendances
-RUN yarn install
+RUN npm install --force
 
 # Copier le reste des fichiers de l'application
 COPY . .
 
 # Construire l'application
-RUN yarn build
+RUN npm run build
 
 # Étape 2 : Configurer Nginx et copier les fichiers construits
 FROM nginx:alpine

From 5e7d337bf81b1a8d532da0f3f2291f09a489ffdf Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:41:07 +0100
Subject: [PATCH 35/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 2e977f5..042590d 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -21,6 +21,8 @@ FROM nginx:alpine
 # Copier les fichiers construits depuis l'étape précédente
 COPY --from=build /app/build /usr/share/nginx/html
 
+RUN cat nginx.conf
+
 # Copier la configuration personnalisée pour Nginx (si nécessaire)
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 

From df5da2acae66ae6889d79adb486af4be45e1411a Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:44:28 +0100
Subject: [PATCH 36/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 042590d..883fecb 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -3,11 +3,11 @@ FROM node:14 AS build
 
 WORKDIR /app
 
-# Copier le fichier package.json et yarn.lock (ou package-lock.json si vous utilisez npm)
+# Copier le fichier package.json et package-lock.json
 COPY package.json package-lock.json ./
 
 # Installer les dépendances
-RUN npm install --force
+RUN npm install
 
 # Copier le reste des fichiers de l'application
 COPY . .
@@ -15,19 +15,11 @@ COPY . .
 # Construire l'application
 RUN npm run build
 
-# Étape 2 : Configurer Nginx et copier les fichiers construits
-FROM nginx:alpine
+# Étape 2 : Configurer Apache et copier les fichiers construits
+FROM httpd:2.4-alpine
 
 # Copier les fichiers construits depuis l'étape précédente
-COPY --from=build /app/build /usr/share/nginx/html
+COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
-RUN cat nginx.conf
-
-# Copier la configuration personnalisée pour Nginx (si nécessaire)
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-
-# Exposer le port 80
+# Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80
-
-# Commande pour démarrer Nginx lorsqu'un conteneur basé sur cette image est lancé
-CMD ["nginx", "-g", "daemon off;"]

From 0bb2e2f226df0e6f5464858cd8e478176dbf12a6 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:48:30 +0100
Subject: [PATCH 37/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 883fecb..cb99eac 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -21,5 +21,6 @@ FROM httpd:2.4-alpine
 # Copier les fichiers construits depuis l'étape précédente
 COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
+RUN ls /usr/local/apache2/htdocs/
 # Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80

From 87b37e75d7cf89413e0acdf36223cb793046b6db Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:51:51 +0100
Subject: [PATCH 38/68] Supprimer 'cryptide_project/nginx.conf'

---
 cryptide_project/nginx.conf | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 cryptide_project/nginx.conf

diff --git a/cryptide_project/nginx.conf b/cryptide_project/nginx.conf
deleted file mode 100644
index 231f646..0000000
--- a/cryptide_project/nginx.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-server {
-    listen 80;
-    server_name server;
-
-    location / {
-        root /usr/share/nginx/html;
-        index index.html;
-        try_files $uri $uri/ /index.html;
-    }
-
-    error_page 500 502 503 504 /50x.html;
-    location = /50x.html {
-        root /usr/share/nginx/html;
-    }
-}

From 55471595c5f2e56fcb3aa9969e6db30e6dea9c2c Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:52:46 +0100
Subject: [PATCH 39/68] Ajouter 'cryptide_project/.htaccess'

---
 cryptide_project/.htaccess | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 cryptide_project/.htaccess

diff --git a/cryptide_project/.htaccess b/cryptide_project/.htaccess
new file mode 100644
index 0000000..0f5b0a2
--- /dev/null
+++ b/cryptide_project/.htaccess
@@ -0,0 +1,2 @@
+AddType text/css .css
+AddType application/javascript .js
\ No newline at end of file

From a60c4ffe3595ad973bad69b407dc94a94065ad44 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:55:12 +0100
Subject: [PATCH 40/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index cb99eac..790c26f 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -21,6 +21,11 @@ FROM httpd:2.4-alpine
 # Copier les fichiers construits depuis l'étape précédente
 COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
+RUN touch /usr/local/apache2/conf/httpd.conf
+
+RUN echo "AddType text/css .css" >> /usr/local/apache2/conf/httpd.conf
+RUN echo >> "AddType application/javascript .js" >> /usr/local/apache2/conf/httpd.conf
+
 RUN ls /usr/local/apache2/htdocs/
 # Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80

From 6a99980e5fd352e14550c153d3fc05f1dfcd759f Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 14:57:38 +0100
Subject: [PATCH 41/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 790c26f..9ef16e9 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -24,7 +24,7 @@ COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 RUN touch /usr/local/apache2/conf/httpd.conf
 
 RUN echo "AddType text/css .css" >> /usr/local/apache2/conf/httpd.conf
-RUN echo >> "AddType application/javascript .js" >> /usr/local/apache2/conf/httpd.conf
+RUN echo "AddType application/javascript .js" >> /usr/local/apache2/conf/httpd.conf
 
 RUN ls /usr/local/apache2/htdocs/
 # Exposer le port 80 (par défaut pour Apache)

From 8a2cc449b2bd8e72da8dfd382eea09c72d3bfb98 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:00:54 +0100
Subject: [PATCH 42/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 9ef16e9..4911633 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -26,6 +26,6 @@ RUN touch /usr/local/apache2/conf/httpd.conf
 RUN echo "AddType text/css .css" >> /usr/local/apache2/conf/httpd.conf
 RUN echo "AddType application/javascript .js" >> /usr/local/apache2/conf/httpd.conf
 
-RUN ls /usr/local/apache2/htdocs/
+RUN ls /usr/local/apache2/conf/httpd.conf
 # Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80

From 5269d8bb30455ec3732dfd2012d8e2ce4e4d5262 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:04:55 +0100
Subject: [PATCH 43/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 4911633..0e82dfa 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -21,11 +21,6 @@ FROM httpd:2.4-alpine
 # Copier les fichiers construits depuis l'étape précédente
 COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
-RUN touch /usr/local/apache2/conf/httpd.conf
-
-RUN echo "AddType text/css .css" >> /usr/local/apache2/conf/httpd.conf
-RUN echo "AddType application/javascript .js" >> /usr/local/apache2/conf/httpd.conf
-
 RUN ls /usr/local/apache2/conf/httpd.conf
 # Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80

From 0e168349b463f016511bfd5f0d36bbc9556722cf Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:06:26 +0100
Subject: [PATCH 44/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 0e82dfa..4f3b608 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -15,12 +15,14 @@ COPY . .
 # Construire l'application
 RUN npm run build
 
+COPY .htacess /app/build/
+
 # Étape 2 : Configurer Apache et copier les fichiers construits
 FROM httpd:2.4-alpine
 
 # Copier les fichiers construits depuis l'étape précédente
 COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
-RUN ls /usr/local/apache2/conf/httpd.conf
+RUN ls /usr/local/apache2/htdocs/
 # Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80

From fd8deb29e2da7a8ba13bbaa8fbd637f883b48936 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:08:55 +0100
Subject: [PATCH 45/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 4f3b608..4a6c702 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -15,6 +15,8 @@ COPY . .
 # Construire l'application
 RUN npm run build
 
+RUN ls
+
 COPY .htacess /app/build/
 
 # Étape 2 : Configurer Apache et copier les fichiers construits

From 1a9a4f2d012efeb1a923659910bee70767f92dc1 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:11:21 +0100
Subject: [PATCH 46/68] Supprimer '. dockerignore'

---
 . dockerignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 . dockerignore

diff --git a/. dockerignore b/. dockerignore
deleted file mode 100644
index 5171c54..0000000
--- a/. dockerignore	
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-npm-debug.log
\ No newline at end of file

From 10949802428623c6f110bfa77081dd749d206f9f Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:14:06 +0100
Subject: [PATCH 47/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/htaccess'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/{.htaccess => htaccess} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename cryptide_project/{.htaccess => htaccess} (100%)

diff --git a/cryptide_project/.htaccess b/cryptide_project/htaccess
similarity index 100%
rename from cryptide_project/.htaccess
rename to cryptide_project/htaccess

From 600d26179d5006c87339b1a0a349b99a402e136c Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:14:27 +0100
Subject: [PATCH 48/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 4a6c702..e973aa3 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -17,7 +17,7 @@ RUN npm run build
 
 RUN ls
 
-COPY .htacess /app/build/
+COPY htacess /app/build/.htacess
 
 # Étape 2 : Configurer Apache et copier les fichiers construits
 FROM httpd:2.4-alpine

From 85aecad0d6369d9899cb81c6a9fe39c30862d430 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:17:23 +0100
Subject: [PATCH 49/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index e973aa3..7bae16f 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -17,7 +17,7 @@ RUN npm run build
 
 RUN ls
 
-COPY htacess /app/build/.htacess
+COPY htaccess /app/build/.htaccess
 
 # Étape 2 : Configurer Apache et copier les fichiers construits
 FROM httpd:2.4-alpine

From f0258382bc8008615a20195a8417bced4db0bc7f Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 15:23:25 +0100
Subject: [PATCH 50/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 7bae16f..7ddd176 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -1,30 +1,23 @@
-# Étape 1 : Construire l'application React
-FROM node:14 AS build
+# Utilise une image de node.js en tant que base
+FROM node:14-alpine
 
+# Définis le répertoire de travail dans le conteneur
 WORKDIR /app
 
-# Copier le fichier package.json et package-lock.json
-COPY package.json package-lock.json ./
+# Copie les fichiers package.json et package-lock.json pour installer les dépendances
+COPY package*.json ./
 
-# Installer les dépendances
+# Installe les dépendances
 RUN npm install
 
-# Copier le reste des fichiers de l'application
+# Copie le reste des fichiers de l'application dans le conteneur
 COPY . .
 
-# Construire l'application
+# Construit l'application React
 RUN npm run build
 
-RUN ls
-
-COPY htaccess /app/build/.htaccess
-
-# Étape 2 : Configurer Apache et copier les fichiers construits
-FROM httpd:2.4-alpine
-
-# Copier les fichiers construits depuis l'étape précédente
-COPY --from=build /app/build/ /usr/local/apache2/htdocs/
-
-RUN ls /usr/local/apache2/htdocs/
-# Exposer le port 80 (par défaut pour Apache)
+# Expose le port 80 du conteneur
 EXPOSE 80
+
+# Commande à exécuter lorsque le conteneur démarre
+CMD ["npm", "start", "--", "-p", "80"]

From 0187700b8896a7ce0b75cbd21af963d77308d2ce Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:04:24 +0100
Subject: [PATCH 51/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 7ddd176..d2658b2 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -1,23 +1,30 @@
-# Utilise une image de node.js en tant que base
-FROM node:14-alpine
+# Étape 1 : Construire l'application React
+FROM node:14 AS build
 
-# Définis le répertoire de travail dans le conteneur
 WORKDIR /app
 
-# Copie les fichiers package.json et package-lock.json pour installer les dépendances
-COPY package*.json ./
+# Copier le fichier package.json et package-lock.json
+COPY package.json package-lock.json ./
 
-# Installe les dépendances
+# Installer les dépendances
 RUN npm install
 
-# Copie le reste des fichiers de l'application dans le conteneur
+# Copier le reste des fichiers de l'application
 COPY . .
 
-# Construit l'application React
+# Construire l'application
 RUN npm run build
 
-# Expose le port 80 du conteneur
-EXPOSE 80
+RUN ls
 
-# Commande à exécuter lorsque le conteneur démarre
-CMD ["npm", "start", "--", "-p", "80"]
+COPY .htacess /app/build/
+
+# Étape 2 : Configurer Apache et copier les fichiers construits
+FROM httpd:2.4-alpine
+
+# Copier les fichiers construits depuis l'étape précédente
+COPY --from=build /app/build/ /usr/local/apache2/htdocs/
+
+RUN ls /usr/local/apache2/htdocs/
+# Exposer le port 80 (par défaut pour Apache)
+EXPOSE 80
\ No newline at end of file

From 8ccc9d69233948d3788f0ae6b5ddcb366fe0daf4 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:06:47 +0100
Subject: [PATCH 52/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index d2658b2..2a023b9 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -17,7 +17,7 @@ RUN npm run build
 
 RUN ls
 
-COPY .htacess /app/build/
+COPY htaccess /app/build/.htaccess
 
 # Étape 2 : Configurer Apache et copier les fichiers construits
 FROM httpd:2.4-alpine

From d023aeb5ea0075ba8e3634a4b53b17a326115796 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:08:14 +0100
Subject: [PATCH 53/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 2a023b9..765aff8 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -17,7 +17,7 @@ RUN npm run build
 
 RUN ls
 
-COPY htaccess /app/build/.htaccess
+
 
 # Étape 2 : Configurer Apache et copier les fichiers construits
 FROM httpd:2.4-alpine
@@ -25,6 +25,9 @@ FROM httpd:2.4-alpine
 # Copier les fichiers construits depuis l'étape précédente
 COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
+COPY htaccess /usr/local/apache2/htdocs/.htaccess
+
+
 RUN ls /usr/local/apache2/htdocs/
 # Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80
\ No newline at end of file

From 756477471eb32f183b0a9999e5ea89ce4f75dad1 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:11:42 +0100
Subject: [PATCH 54/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 765aff8..f21dfd8 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -15,10 +15,6 @@ COPY . .
 # Construire l'application
 RUN npm run build
 
-RUN ls
-
-
-
 # Étape 2 : Configurer Apache et copier les fichiers construits
 FROM httpd:2.4-alpine
 
@@ -28,6 +24,6 @@ COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 COPY htaccess /usr/local/apache2/htdocs/.htaccess
 
 
-RUN ls /usr/local/apache2/htdocs/
+RUN ls -a /usr/local/apache2/htdocs/
 # Exposer le port 80 (par défaut pour Apache)
 EXPOSE 80
\ No newline at end of file

From 5add06f8b0c12bde7dfd5c57a44ce08ac581d074 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:15:04 +0100
Subject: [PATCH 55/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index f21dfd8..119d587 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -23,6 +23,8 @@ COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
 COPY htaccess /usr/local/apache2/htdocs/.htaccess
 
+RUN cat /usr/local/apache2/htdocs/.htaccess
+
 
 RUN ls -a /usr/local/apache2/htdocs/
 # Exposer le port 80 (par défaut pour Apache)

From 8e7ae8b59adfd1155f5f8d9183f9d4d0bafd248c Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:19:52 +0100
Subject: [PATCH 56/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/htaccess'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/htaccess | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cryptide_project/htaccess b/cryptide_project/htaccess
index 0f5b0a2..cee0c96 100644
--- a/cryptide_project/htaccess
+++ b/cryptide_project/htaccess
@@ -1,2 +1,4 @@
-AddType text/css .css
-AddType application/javascript .js
\ No newline at end of file
+<FilesMatch "\.(css|js)$">
+    ForceType text/css
+    Header set Content-Type "text/css"
+</FilesMatch>

From 5e27fb368faf4951324368fbf437493659a5c46c Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:21:15 +0100
Subject: [PATCH 57/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/htaccess'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/htaccess | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cryptide_project/htaccess b/cryptide_project/htaccess
index cee0c96..cf3d09a 100644
--- a/cryptide_project/htaccess
+++ b/cryptide_project/htaccess
@@ -1,4 +1,9 @@
-<FilesMatch "\.(css|js)$">
+<FilesMatch "\.css$">
     ForceType text/css
     Header set Content-Type "text/css"
 </FilesMatch>
+
+<FilesMatch "\.js$">
+    ForceType application/javascript
+    Header set Content-Type "application/javascript"
+</FilesMatch>

From ad29ab9163c55c0c7928981cb2e08c2385fdf095 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:28:36 +0100
Subject: [PATCH 58/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 119d587..abf151f 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -23,6 +23,15 @@ COPY --from=build /app/build/ /usr/local/apache2/htdocs/
 
 COPY htaccess /usr/local/apache2/htdocs/.htaccess
 
+RUN ls /usr/local/apache2/htdocs/static
+
+RUN ls /usr/local/apache2/htdocs/static/css
+
+RUN ls /usr/local/apache2/htdocs/static/js
+
+RUN ls /usr/local/apache2/htdocs/static/media
+
+
 RUN cat /usr/local/apache2/htdocs/.htaccess
 
 

From 11f4c43cca11cc8f807d7c84551581967abceb26 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:32:58 +0100
Subject: [PATCH 59/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 40 ++++++++++++-------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index abf151f..81257ec 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -1,40 +1,26 @@
-# Étape 1 : Construire l'application React
-FROM node:14 AS build
+# Utiliser une image Node.js avec la version souhaitée
+FROM node:14
 
+# Créer le répertoire de travail dans l'image
 WORKDIR /app
 
-# Copier le fichier package.json et package-lock.json
-COPY package.json package-lock.json ./
+# Copier le package.json et le package-lock.json pour installer les dépendances
+COPY package*.json ./
 
 # Installer les dépendances
 RUN npm install
 
-# Copier le reste des fichiers de l'application
+# Copier les fichiers de l'application dans l'image
 COPY . .
 
-# Construire l'application
+# Construire l'application React
 RUN npm run build
 
-# Étape 2 : Configurer Apache et copier les fichiers construits
-FROM httpd:2.4-alpine
+# Exposer le port sur lequel le serveur va écouter
+EXPOSE 3000
 
-# Copier les fichiers construits depuis l'étape précédente
-COPY --from=build /app/build/ /usr/local/apache2/htdocs/
+# Installer le serveur "serve" de manière globale
+RUN npm install -g serve
 
-COPY htaccess /usr/local/apache2/htdocs/.htaccess
-
-RUN ls /usr/local/apache2/htdocs/static
-
-RUN ls /usr/local/apache2/htdocs/static/css
-
-RUN ls /usr/local/apache2/htdocs/static/js
-
-RUN ls /usr/local/apache2/htdocs/static/media
-
-
-RUN cat /usr/local/apache2/htdocs/.htaccess
-
-
-RUN ls -a /usr/local/apache2/htdocs/
-# Exposer le port 80 (par défaut pour Apache)
-EXPOSE 80
\ No newline at end of file
+# Commande pour démarrer le serveur lorsque le conteneur est lancé
+CMD ["serve", "-s", "build", "-l", "3000"]

From f919ca1a39b9308c39831154742feb3da627c567 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:37:51 +0100
Subject: [PATCH 60/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 81257ec..307e725 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -17,10 +17,10 @@ COPY . .
 RUN npm run build
 
 # Exposer le port sur lequel le serveur va écouter
-EXPOSE 3000
+EXPOSE 8080
 
 # Installer le serveur "serve" de manière globale
 RUN npm install -g serve
 
 # Commande pour démarrer le serveur lorsque le conteneur est lancé
-CMD ["serve", "-s", "build", "-l", "3000"]
+CMD ["serve", "-s", "build", "-l", "8080"]

From 711f3ecd48569dde5131fd844b45c348c015e638 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:42:45 +0100
Subject: [PATCH 61/68] Ajouter 'cryptide_project/serve.json'

---
 cryptide_project/serve.json | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 cryptide_project/serve.json

diff --git a/cryptide_project/serve.json b/cryptide_project/serve.json
new file mode 100644
index 0000000..c454818
--- /dev/null
+++ b/cryptide_project/serve.json
@@ -0,0 +1,6 @@
+{
+  "headers": [
+    { "source": "**/*.js", "headers": [{ "key": "Content-Type", "value": "application/javascript; charset=utf-8" }] }
+  ]
+}
+

From be7f1e1e19902f0fdc41de88378bc5bbd5b2ebd1 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:43:32 +0100
Subject: [PATCH 62/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 307e725..5b6bd21 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -16,6 +16,8 @@ COPY . .
 # Construire l'application React
 RUN npm run build
 
+COPY serve.json build/
+
 # Exposer le port sur lequel le serveur va écouter
 EXPOSE 8080
 
@@ -23,4 +25,4 @@ EXPOSE 8080
 RUN npm install -g serve
 
 # Commande pour démarrer le serveur lorsque le conteneur est lancé
-CMD ["serve", "-s", "build", "-l", "8080"]
+CMD ["serve", "-s", "build", "-l", "8080", "--config", "serve.json"]

From ec50a8b3e16a80bd5a000f2bc3d7756b4f7e660e Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:51:39 +0100
Subject: [PATCH 63/68] Ajouter 'cryptide_project/server.js'

---
 cryptide_project/server.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 cryptide_project/server.js

diff --git a/cryptide_project/server.js b/cryptide_project/server.js
new file mode 100644
index 0000000..703ebb4
--- /dev/null
+++ b/cryptide_project/server.js
@@ -0,0 +1,24 @@
+const express = require('express');
+const path = require('path');
+
+const app = express();
+const port = process.env.PORT || 8080;
+
+// Définir le type MIME pour les fichiers JavaScript
+app.use('*.js', (req, res, next) => {
+  res.type('application/javascript');
+  next();
+});
+
+// Servir les fichiers statiques depuis le dossier 'build'
+app.use(express.static(path.join(__dirname, 'build')));
+
+// Route par défaut pour servir l'application React
+app.get('*', (req, res) => {
+  res.sendFile(path.join(__dirname, 'build', 'index.html'));
+});
+
+// Démarrer le serveur
+app.listen(port, () => {
+  console.log(`Serveur en cours d'exécution sur le port ${port}`);
+});

From 7e99866108efdf9476572375d5d16b1c0a78ffbb Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:52:10 +0100
Subject: [PATCH 64/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 5b6bd21..68e5851 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -1,28 +1,22 @@
-# Utiliser une image Node.js avec la version souhaitée
 FROM node:14
 
-# Créer le répertoire de travail dans l'image
 WORKDIR /app
 
-# Copier le package.json et le package-lock.json pour installer les dépendances
 COPY package*.json ./
 
-# Installer les dépendances
 RUN npm install
 
-# Copier les fichiers de l'application dans l'image
 COPY . .
 
-# Construire l'application React
 RUN npm run build
 
-COPY serve.json build/
-
-# Exposer le port sur lequel le serveur va écouter
 EXPOSE 8080
 
-# Installer le serveur "serve" de manière globale
-RUN npm install -g serve
+# Installez express
+RUN npm install express
+
+# Copiez le script serveur personnalisé
+COPY server.js .
 
-# Commande pour démarrer le serveur lorsque le conteneur est lancé
-CMD ["serve", "-s", "build", "-l", "8080", "--config", "serve.json"]
+# Commande pour démarrer le serveur personnalisé
+CMD ["node", "server.js"]

From 42b28c29b67c11df0cdfad25293024ec5801eb98 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:55:48 +0100
Subject: [PATCH 65/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 68e5851..1be7cb5 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -11,7 +11,7 @@ COPY . .
 RUN npm run build
 
 EXPOSE 8080
-
+#
 # Installez express
 RUN npm install express
 

From fcb23c625a03cf851f53abb538e94c9efda2a00d Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:59:45 +0100
Subject: [PATCH 66/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/Dockerfile'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/Dockerfile b/cryptide_project/Dockerfile
index 1be7cb5..fbd4dc7 100644
--- a/cryptide_project/Dockerfile
+++ b/cryptide_project/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 
 RUN npm run build
 
-EXPOSE 8080
+EXPOSE 80
 #
 # Installez express
 RUN npm install express

From 31676ca2acfa632afdf9a6f8ad3099caf104229d Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 16:59:59 +0100
Subject: [PATCH 67/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/server.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cryptide_project/server.js b/cryptide_project/server.js
index 703ebb4..20c7479 100644
--- a/cryptide_project/server.js
+++ b/cryptide_project/server.js
@@ -2,7 +2,7 @@ const express = require('express');
 const path = require('path');
 
 const app = express();
-const port = process.env.PORT || 8080;
+const port = process.env.PORT || 80;
 
 // Définir le type MIME pour les fichiers JavaScript
 app.use('*.js', (req, res, next) => {

From c686ca78bc0e184ce20b82a12e5ffe2430d679e5 Mon Sep 17 00:00:00 2001
From: Thomas CHAZOT <thomas.chazot2@etu.uca.fr>
Date: Mon, 4 Dec 2023 17:01:43 +0100
Subject: [PATCH 68/68] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'cryptide=5Fp?=
 =?UTF-8?q?roject/server.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/server.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cryptide_project/server.js b/cryptide_project/server.js
index 20c7479..cb7b31b 100644
--- a/cryptide_project/server.js
+++ b/cryptide_project/server.js
@@ -4,15 +4,15 @@ const path = require('path');
 const app = express();
 const port = process.env.PORT || 80;
 
+// Servir les fichiers statiques depuis le dossier 'build'
+app.use(express.static(path.join(__dirname, 'build')));
+
 // Définir le type MIME pour les fichiers JavaScript
 app.use('*.js', (req, res, next) => {
-  res.type('application/javascript');
+  res.type('application/javascript; charset=utf-8');
   next();
 });
 
-// Servir les fichiers statiques depuis le dossier 'build'
-app.use(express.static(path.join(__dirname, 'build')));
-
 // Route par défaut pour servir l'application React
 app.get('*', (req, res) => {
   res.sendFile(path.join(__dirname, 'build', 'index.html'));