Skip to content

Commit

Permalink
Closes #86; Jetstream deploy changes
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Apr 9, 2022
1 parent 3520236 commit fec1989
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Auth/Makefile
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Client/.env.local
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REACT_APP_AUTH_API_URI = http://localhost:30000/api
REACT_APP_CACHE_API_URI = http://localhost:32000/api
REACT_APP_AUTH_API_URI = http://149.165.157.85:30000/api
REACT_APP_CACHE_API_URI = http://149.165.157.85:32000/api
4 changes: 2 additions & 2 deletions Client/Makefile
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Data Ingestor/Makefile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Data Ingestor/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions cache/Makefile
Original file line number Diff line number Diff line change
@@ -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
Binary file modified cache/cache-0.0.1-SNAPSHOT.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public ResponseEntity<String> isWorking() {
}

@PostMapping("/getplot")
@CrossOrigin(origins = "http://localhost:30500")
@CrossOrigin(origins = "http://149.165.157.85:30500")
public ResponseEntity<GetPlotResponse> getPlot(@RequestBody GetPlotRequest req) {

try {
Expand Down Expand Up @@ -119,7 +119,7 @@ public ResponseEntity<GetPlotResponse> getPlot(@RequestBody GetPlotRequest req)
}

@PostMapping("/getvideo")
@CrossOrigin(origins = "http://localhost:30500")
@CrossOrigin(origins = "http://149.165.157.85:30500")
public ResponseEntity<GetPlotResponse> getVidoe(@RequestBody GetPlotRequest req) {

try {
Expand Down
3 changes: 2 additions & 1 deletion kube/auth-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion kube/cache-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion kube/data-ingestor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions kube/mongo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion kube/react-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit fec1989

Please sign in to comment.