Browse Source

Changed docker-compose file to work on all systems, added way to get real ip from sockets in docker.

KrisVos130 8 years ago
parent
commit
d232047e40
2 changed files with 5 additions and 7 deletions
  1. 2 1
      backend/logic/io.js
  2. 3 6
      docker-compose.yml

+ 2 - 1
backend/logic/io.js

@@ -44,7 +44,8 @@ module.exports = {
 		});
 
 		this.io.on('connection', socket => {
-			console.info('User has connected');
+			socket.ip = socket.request.headers['x-forwarded-for'] || '0.0.0.0';
+			console.info(`User has connected. IP: ${socket.ip}`);
 
 			// catch when the socket has been disconnected
 			socket.on('disconnect', () => {

+ 3 - 6
docker-compose.yml

@@ -3,25 +3,22 @@ services:
   backend:
     build: ./backend
     ports:
-    - "8080:8080"
+    - "${BACKEND_PORT}:8080"
     volumes:
     - ./backend:/opt/app
-    - ./log:/opt/log
     links:
     - mongo
     - redis
-    environment:
-    - NGINX_PORT=80
   frontend:
     build: ./frontend
     ports:
-    - "80:80"
+    - "${FRONTEND_PORT}:80"
     volumes:
     - ./frontend:/opt/app
   mongo:
     image: mongo
     ports:
-    - "27017:27017"
+    - "27018:27018"
   mongoclient:
     image: mongoclient/mongoclient
     ports: