Docker working

topfreegames · Nov 7, 2016 · 575556f · 575556f
1 parent ccef508
commit 575556f
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -63,11 +63,11 @@ _services-shutdown:
 	@env MY_IP=${MY_IP} docker-compose -p marathon -f ./docker-compose.yaml stop
 	@env MY_IP=${MY_IP} docker-compose -p marathon -f ./docker-compose.yaml rm -f
 
-docker-build:
+docker-build: build
 	@docker build -t marathon .
 
 docker-run:
-	@docker run -i -t \
+	@docker run -d -t \
 		-e "NODE_ENV=development" \
 		-e "PORT=8000" \
 		-e "PG_URL=postgresql://marathon@${MY_IP}:22222/marathon" \

diff --git a/lib/marathon.js b/lib/marathon.js
diff --git a/lib/marathon.js.map b/lib/marathon.js.map