From db2758a21127a9d23f6ff3c925c8b0f494467fb9 Mon Sep 17 00:00:00 2001
From: Yannick Armand <yannick.armand@protonmail.com>
Date: Thu, 6 Jan 2022 21:31:58 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20des=20fichiers=20docker,=20c?=
 =?UTF-8?q?r=C3=A9ation=20d'un=20dossier=20d=C3=A9di=C3=A9,=20et=20am?=
 =?UTF-8?q?=C3=A9lioration=20de=20la=20logique?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore             |  2 ++
 Dockerfile                | 11 -----------
 docker/Dockerfile         | 15 +++++++++++++++
 docker/docker-compose.yml |  5 +++++
 4 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 .dockerignore
 delete mode 100644 Dockerfile
 create mode 100644 docker/Dockerfile
 create mode 100644 docker/docker-compose.yml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..aff3886
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+/node_modules/
+/public/
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 579a7e0..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM httpd:2-alpine
-
-COPY . /var/yannicka
-
-RUN apk add --update nodejs npm
-
-RUN cd /var/yannicka && npm install && npm run build && mv public/* /usr/local/apache2/htdocs/
-
-EXPOSE 80
-
-CMD [ "httpd-foreground" ]
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..ea629a0
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,15 @@
+FROM httpd:2-alpine
+
+WORKDIR /var/yannicka
+
+COPY . .
+
+RUN apk add --update nodejs npm
+
+RUN npm install && npm run build && rm node_modules -r && mv public/* /usr/local/apache2/htdocs/
+
+RUN apk del nodejs npm
+
+EXPOSE 80
+
+CMD [ "httpd-foreground" ]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..0265b83
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,5 @@
+services:
+  httpd:
+    build: .
+    ports:
+      - "8080:80"