Merge pull request #3 from germangb/docker-friendly

Cool, I just had time to test today. I was looking at the code and was about to say that changing the global IP inside the Constants class was a very bad style, but investigating it I found out it was put there by me originally. I am just saying that this was a bad design by my part and no one should ever do something like this, so let's avoid this in the future =).

Author: catabriga

.gitignore

@@ -0,0 +1,3 @@
+*.swp
+/bin
+*.jar

Dockerfile

@@ -0,0 +1,7 @@
+FROM java:openjdk-7-jdk
+
+RUN mkdir /compile
+
+WORKDIR /compile
+
+CMD [ "./compile.sh" ]

compile.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+mkdir -p bin
+javac -Xlint:deprecation -d bin/ -sourcepath src/ -classpath bin/ src/Graphwar/*.java src/GraphServer/*.java src/GlobalServer/*.java src/RoomServer/*.java
+
+cp -r bin/Graphwar Graphwar
+cp -r bin/GraphServer GraphServer
+cp -r bin/GlobalServer GlobalServer
+cp -r bin/RoomServer RoomServer
+
+jar cfe graphwar.jar Graphwar.Graphwar GraphServer Graphwar rsc
+jar cfe roomServer.jar RoomServer.RoomServer GraphServer RoomServer rsc
+jar cfe globalServer.jar GlobalServer.GlobalServer GraphServer GlobalServer rsc
+
+rm -rf Graphwar
+rm -rf GraphServer
+rm -rf GlobalServer
+rm -rf RoomServer

globalServer.jar

@@ -1,9 +1,7 @@
-
 all:
 
 	mkdir -p bin
-	javac -d bin/ -sourcepath src/ -classpath bin/ src/Graphwar/*.java src/GraphServer/*.java src/GlobalServer/*.java src/RoomServer/*.java
-
+	javac -Xlint:deprecation -d bin/ -sourcepath src/ -classpath bin/ src/Graphwar/*.java src/GraphServer/*.java src/GlobalServer/*.java src/RoomServer/*.java
 	cp -r bin/Graphwar Graphwar
 	cp -r bin/GraphServer GraphServer
 	cp -r bin/GlobalServer GlobalServer
@@ -15,7 +13,30 @@ all:
 	rm -rf GraphServer
 	rm -rf GlobalServer
 	rm -rf RoomServer
-	
+
+docker-graphwar:
+
+	## build graphwar inside of a container
+	docker run --rm \
+		-v ${PWD}:/compile \
+		graphwar/build
+
+docker-image:
+
+	## build docker image
+	docker build -t graphwar/build .
+
+run-client:
+
+	## run graphwar on a container
+	docker run --rm \
+		-v ${PWD}:/compile \
+		-v /tmp/.X11-unix:/tmp/.X11-unix \
+		-e DISPLAY=${DISPLAY} \
+		--network host \
+		graphwar/build \
+		java -jar graphwar.jar
+
 clean:
 
 	rm -r bin

graphwar.jar

@@ -109,8 +109,5 @@ To run a local server and connect to it you must pass the ip of the local server
 and to the globalServer as a command line argument. So to start a server locally the commands are:
 
 * java -jar globalServer.jar [your-server-ip]
-* java -jar roomServer.jar
+* java -jar roomServer.jar [your-server-ip]
 * java -jar graphwar.jar [your-server-ip]
-
-The roomServer must be run on the same machine as the globalServer.
-

makefile

@@ -40,7 +40,7 @@ public Room(int roomNum) throws IOException
 
 		new Thread(gameServer).start();
 
-		globalClient.joinGlobalServer("localhost", Constants.GLOBAL_PORT, Constants.DUMMY_NAME);
+		globalClient.joinGlobalServer(Constants.GLOBAL_IP, Constants.GLOBAL_PORT, Constants.DUMMY_NAME);
 		globalClient.createRoom("Public Room "+roomNum, port);
 	}
 

readme.md

@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.ListIterator;
 
+import GraphServer.Constants;
+
 public class RoomServer implements Runnable
 {
 	private List<Room> rooms;
@@ -139,9 +141,20 @@ else if(numEmpty > 3)
 		}		
 
 	}
+
+	public static void handleArgs(String[] args)
+	{
+		if(args.length > 0)
+		{
+			// Overrides ip to create local server
+			Constants.GLOBAL_IP = args[0];
+		}
+	}
 
 	public static void main(String[] args)
 	{
+		handleArgs(args);
+
 		RoomServer roomServer = new RoomServer();
 
 		new Thread(roomServer).start();