Added Dockerfile for the router

gabrielhamel · Jan 30, 2020 · 83174c4 · 83174c4
1 parent 5171be8
commit 83174c4
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 → webserver/router/build/class/Server.js b/webserver/build/class/Server.js → webserver/router/build/class/Server.js
diff --git a/webserver/build/class/Socket.js → webserver/router/build/class/Socket.js b/webserver/build/class/Socket.js → webserver/router/build/class/Socket.js
diff --git a/webserver/build/index.js → webserver/router/build/index.js b/webserver/build/index.js → webserver/router/build/index.js
diff --git a/webserver/package-lock.json → webserver/router/package-lock.json b/webserver/package-lock.json → webserver/router/package-lock.json
diff --git a/webserver/package.json → webserver/router/package.json b/webserver/package.json → 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 → webserver/router/src/class/Server.ts b/webserver/src/class/Server.ts → webserver/router/src/class/Server.ts
diff --git a/webserver/src/class/Socket.ts → webserver/router/src/class/Socket.ts b/webserver/src/class/Socket.ts → webserver/router/src/class/Socket.ts
diff --git a/webserver/src/index.ts → webserver/router/src/index.ts b/webserver/src/index.ts → webserver/router/src/index.ts
diff --git a/webserver/tsconfig.json → webserver/router/tsconfig.json b/webserver/tsconfig.json → webserver/router/tsconfig.json