Updating services

IF1007 · Jun 25, 2018 · 3a1d7cd · 3a1d7cd
1 parent d83367e
commit 3a1d7cd
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "cartola-rest-api"]
 	path = cartola-rest-api
 	url = https://github.com/dijckstra/cartola-rest-api.git
+[submodule "Cartola-Interface"]
+	path = Cartola-Interface
+	url = https://github.com/leoribeiro36/Cartola-Interface.git
diff --git a/Cartola-Interface b/Cartola-Interface
diff --git a/authentication_middleware b/authentication_middleware
diff --git a/cartola-data-scrapper b/cartola-data-scrapper
diff --git a/cartola-rest-api b/cartola-rest-api
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,10 +13,12 @@ services:
     environment: 
       MONGO_INITDB_DATABASE: cartola
 
-  rest-api:
+  restapi:
     build: ./cartola-rest-api
     image: cartolaapi
     command: bash -c "sleep 5 && /go/bin/cartola-rest-api"
+    ports: 
+      - 3011:3000
     depends_on: 
       - mongo
       - naming-service
@@ -26,7 +28,7 @@ services:
     image: cartolascrapper
     command: bash -c "sleep 10 && /go/bin/cartola-data-scrapper"
     depends_on: 
-      - rest-api
+      - restapi
       - naming-service
 
   processor:
@@ -36,6 +38,7 @@ services:
     ports:
       - 3000:3000
     depends_on: 
+      - restapi
       - mongo
       - naming-service
 
@@ -57,3 +60,13 @@ services:
     depends_on: 
       - naming-service
       - login
+
+
+  interface:
+    build: ./Cartola-Interface
+    image: frontend
+    command: bash -c "sleep 10 && npm start"
+    ports:
+      - 80:3000
+    depends_on:
+      - authentication
diff --git a/login b/login
+1 −1		api/players.go
+1 −1		data/database/player_dao.go
+1 −1		dockerfile
+1 −1		main.go