diff --git a/Auth/Makefile b/Auth/Makefile index 5f9ded1..a25cfa8 100644 --- a/Auth/Makefile +++ b/Auth/Makefile @@ -1,5 +1,5 @@ build: - docker build --no-cache -t dsdummies/auth-service:1.02 . + docker build --no-cache -t dsdummies/auth-service:a1.01 . push: - docker push dsdummies/auth-service:1.02 + docker push dsdummies/auth-service:a1.01 diff --git a/Client/.env.local b/Client/.env.local index d208571..ebe255b 100644 --- a/Client/.env.local +++ b/Client/.env.local @@ -1,2 +1,2 @@ -REACT_APP_AUTH_API_URI = http://localhost:30000/api -REACT_APP_CACHE_API_URI = http://localhost:32000/api \ No newline at end of file +REACT_APP_AUTH_API_URI = http://149.165.157.85:30000/api +REACT_APP_CACHE_API_URI = http://149.165.157.85:32000/api diff --git a/Client/Makefile b/Client/Makefile index e8253ea..4d1f277 100644 --- a/Client/Makefile +++ b/Client/Makefile @@ -1,5 +1,5 @@ build: - docker build --no-cache -t dsdummies/client-react:1.02 . + docker build --no-cache -t dsdummies/client-react:a1.01 . push: - docker push dsdummies/client-react:1.02 + docker push dsdummies/client-react:a1.01 diff --git a/Data Ingestor/Makefile b/Data Ingestor/Makefile index c018af0..30ca3f6 100644 --- a/Data Ingestor/Makefile +++ b/Data Ingestor/Makefile @@ -1,5 +1,5 @@ build: - docker build --no-cache -t dsdummies/data-ingestor:1.02 . + docker build --no-cache -t dsdummies/data-ingestor:a1.02 . push: - docker push dsdummies/data-ingestor:1.02 + docker push dsdummies/data-ingestor:a1.02 diff --git a/Data Ingestor/main.py b/Data Ingestor/main.py index ee100d7..dc1707c 100644 --- a/Data Ingestor/main.py +++ b/Data Ingestor/main.py @@ -89,7 +89,7 @@ def get(self): api.add_resource(IsWorking, "/isworking") api.add_resource(NEXRAD_Plot, "/get-plot") -api.add_resource(NEXRAD_Video, "/") +api.add_resource(NEXRAD_Video, "/get-video") if __name__ == "__main__": app.run(host='0.0.0.0', port=5678) diff --git a/cache/Makefile b/cache/Makefile index 6172a95..b947cc3 100644 --- a/cache/Makefile +++ b/cache/Makefile @@ -1,5 +1,5 @@ build: - docker build --no-cache -t dsdummies/cache-service:1.02 . + docker build --no-cache -t dsdummies/cache-service:a1.02 . push: - docker push dsdummies/cache-service:1.02 + docker push dsdummies/cache-service:a1.02 diff --git a/cache/cache-0.0.1-SNAPSHOT.jar b/cache/cache-0.0.1-SNAPSHOT.jar index bb8602c..f6c89e4 100644 Binary files a/cache/cache-0.0.1-SNAPSHOT.jar and b/cache/cache-0.0.1-SNAPSHOT.jar differ diff --git a/cache/src/main/java/com/distsystems/main/Controller/WeatherDataController.java b/cache/src/main/java/com/distsystems/main/Controller/WeatherDataController.java index 0d7a12c..cfb986b 100644 --- a/cache/src/main/java/com/distsystems/main/Controller/WeatherDataController.java +++ b/cache/src/main/java/com/distsystems/main/Controller/WeatherDataController.java @@ -40,7 +40,7 @@ public ResponseEntity isWorking() { } @PostMapping("/getplot") - @CrossOrigin(origins = "http://localhost:30500") + @CrossOrigin(origins = "http://149.165.157.85:30500") public ResponseEntity getPlot(@RequestBody GetPlotRequest req) { try { @@ -119,7 +119,7 @@ public ResponseEntity getPlot(@RequestBody GetPlotRequest req) } @PostMapping("/getvideo") - @CrossOrigin(origins = "http://localhost:30500") + @CrossOrigin(origins = "http://149.165.157.85:30500") public ResponseEntity getVidoe(@RequestBody GetPlotRequest req) { try { diff --git a/kube/auth-deployment.yaml b/kube/auth-deployment.yaml index 75e88c0..b5a0dc0 100644 --- a/kube/auth-deployment.yaml +++ b/kube/auth-deployment.yaml @@ -27,9 +27,10 @@ spec: spec: containers: - name: node-app - image: dsdummies/auth-service:1.02 + image: dsdummies/auth-service:a1.01 ports: - containerPort: 8000 env: - name: DATABASE value: mongodb://mongo:27017/user_auth + imagePullPolicy: Always diff --git a/kube/cache-deployment.yaml b/kube/cache-deployment.yaml index 3fa6d34..6f4aef1 100644 --- a/kube/cache-deployment.yaml +++ b/kube/cache-deployment.yaml @@ -27,9 +27,10 @@ spec: spec: containers: - name: cache-app - image: dsdummies/cache-service:1.02 + image: dsdummies/cache-service:a1.02 ports: - containerPort: 8080 + imagePullPolicy: Always env: - name: DATABASE value: mongodb://mongo:27017/user_auth diff --git a/kube/data-ingestor.yaml b/kube/data-ingestor.yaml index ab9cf67..1698c27 100644 --- a/kube/data-ingestor.yaml +++ b/kube/data-ingestor.yaml @@ -27,6 +27,7 @@ spec: spec: containers: - name: di-app - image: dsdummies/data-ingestor:1.0 + image: dsdummies/data-ingestor:a1.02 ports: - containerPort: 5678 + imagePullPolicy: Always diff --git a/kube/mongo.yaml b/kube/mongo.yaml index b8621b8..de118b1 100644 --- a/kube/mongo.yaml +++ b/kube/mongo.yaml @@ -30,8 +30,3 @@ spec: image: mongo:4.4-bionic ports: - containerPort: 27017 - env: - - name: MONGO_INITDB_ROOT_USERNAME - value: PROJECT1-ADMIN - - name: MONGO_INITDB_ROOT_PASSWORD - value: Project1-ADS diff --git a/kube/react-deployment.yaml b/kube/react-deployment.yaml index 9dbe625..d77fbc8 100644 --- a/kube/react-deployment.yaml +++ b/kube/react-deployment.yaml @@ -27,6 +27,8 @@ spec: spec: containers: - name: react-app - image: dsdummies/client-react:1.0 + image: dsdummies/client-react:a1.01 ports: - containerPort: 3000 + imagePullPolicy: Always +