From 83174c4465cd8f46ba9a2dc8c1f52543fb557700 Mon Sep 17 00:00:00 2001
From: Gabouchet <gabriel.hamel@epitech.eu>
Date: Thu, 30 Jan 2020 20:59:19 +0100
Subject: [PATCH] Added Dockerfile for the router

---
 docker-compose.yml                           | 11 ++++++++++-
 server/Dockerfile                            |  2 +-
 webserver/router/Dockerfile                  |  7 +++++++
 webserver/{ => router}/build/class/Server.js |  0
 webserver/{ => router}/build/class/Socket.js |  0
 webserver/{ => router}/build/index.js        |  0
 webserver/{ => router}/package-lock.json     |  0
 webserver/{ => router}/package.json          |  2 +-
 webserver/{ => router}/src/class/Server.ts   |  0
 webserver/{ => router}/src/class/Socket.ts   |  0
 webserver/{ => router}/src/index.ts          |  0
 webserver/{ => router}/tsconfig.json         |  0
 12 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 webserver/router/Dockerfile
 rename webserver/{ => router}/build/class/Server.js (100%)
 rename webserver/{ => router}/build/class/Socket.js (100%)
 rename webserver/{ => router}/build/index.js (100%)
 rename webserver/{ => router}/package-lock.json (100%)
 rename webserver/{ => router}/package.json (90%)
 rename webserver/{ => router}/src/class/Server.ts (100%)
 rename webserver/{ => router}/src/class/Socket.ts (100%)
 rename webserver/{ => router}/src/index.ts (100%)
 rename webserver/{ => router}/tsconfig.json (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 10d6ea4..a54c873 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,4 +3,13 @@ services:
   game_server:
     build: server
     ports:
-      - "3000:8080"
+      - "3000:3000"
+
+  router:
+    build: webserver/router
+    depends_on:
+      - game_server
+    ports:
+      - "3001:3001"
+    links:
+      - game_server
diff --git a/server/Dockerfile b/server/Dockerfile
index d400a48..eb695a1 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -3,4 +3,4 @@ WORKDIR /usr/src/zappy
 COPY . server/
 COPY Makefile .
 RUN make zappy_server
-CMD ["./zappy_server", "-p", "8080", "-x", "30", "-y", "30", "-n", "team1", "team2", "-c", "2", "-f", "1"]
+CMD ["./zappy_server", "-p", "3000", "-x", "30", "-y", "30", "-n", "team1", "team2", "-c", "2", "-f", "1"]
diff --git a/webserver/router/Dockerfile b/webserver/router/Dockerfile
new file mode 100644
index 0000000..ab6e65c
--- /dev/null
+++ b/webserver/router/Dockerfile
@@ -0,0 +1,7 @@
+FROM node:13.7.0-alpine3.10
+WORKDIR /usr/src/router
+COPY . .
+RUN npm i
+RUN npm i typescript@3.4.5 -g
+RUN tsc
+CMD ["npm", "run-script", "start"]
diff --git a/webserver/build/class/Server.js b/webserver/router/build/class/Server.js
similarity index 100%
rename from webserver/build/class/Server.js
rename to webserver/router/build/class/Server.js
diff --git a/webserver/build/class/Socket.js b/webserver/router/build/class/Socket.js
similarity index 100%
rename from webserver/build/class/Socket.js
rename to webserver/router/build/class/Socket.js
diff --git a/webserver/build/index.js b/webserver/router/build/index.js
similarity index 100%
rename from webserver/build/index.js
rename to webserver/router/build/index.js
diff --git a/webserver/package-lock.json b/webserver/router/package-lock.json
similarity index 100%
rename from webserver/package-lock.json
rename to webserver/router/package-lock.json
diff --git a/webserver/package.json b/webserver/router/package.json
similarity index 90%
rename from webserver/package.json
rename to webserver/router/package.json
index 0db50fa..a7b8918 100644
--- a/webserver/package.json
+++ b/webserver/router/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "build/index.js",
   "scripts": {
-    "start": "node build/index.js 4242 8080"
+    "start": "node build/index.js 3001 3000"
   },
   "author": "",
   "license": "ISC",
diff --git a/webserver/src/class/Server.ts b/webserver/router/src/class/Server.ts
similarity index 100%
rename from webserver/src/class/Server.ts
rename to webserver/router/src/class/Server.ts
diff --git a/webserver/src/class/Socket.ts b/webserver/router/src/class/Socket.ts
similarity index 100%
rename from webserver/src/class/Socket.ts
rename to webserver/router/src/class/Socket.ts
diff --git a/webserver/src/index.ts b/webserver/router/src/index.ts
similarity index 100%
rename from webserver/src/index.ts
rename to webserver/router/src/index.ts
diff --git a/webserver/tsconfig.json b/webserver/router/tsconfig.json
similarity index 100%
rename from webserver/tsconfig.json
rename to webserver/router/tsconfig.json