Skip to content

Commit

Permalink
Fixes #87; Due to random deploy error on Jetstream instance, need to …
Browse files Browse the repository at this point in the history
…change the Jetstream instance again
  • Loading branch information
root committed Apr 19, 2022
1 parent 29bc535 commit 6462ab2
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 13 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:a1.01 .
docker build --no-cache -t dsdummies/auth-service:a1.02 .

push:
docker push dsdummies/auth-service:a1.01
docker push dsdummies/auth-service:a1.02
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://149.165.157.85:30000/api
REACT_APP_CACHE_API_URI = http://149.165.157.85:32000/api
REACT_APP_AUTH_API_URI = http://149.165.156.154:30000/api
REACT_APP_CACHE_API_URI = http://149.165.156.154: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:a1.01 .
docker build --no-cache -t dsdummies/client-react:a1.02 .

push:
docker push dsdummies/client-react:a1.01
docker push dsdummies/client-react:a1.02
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:a1.02 .
docker build --no-cache -t dsdummies/data-ingestor:a1.03 .

push:
docker push dsdummies/data-ingestor:a1.02
docker push dsdummies/data-ingestor:a1.03
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 @@ -28,7 +28,7 @@ public ResponseEntity<String> isWorking() {
}

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

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

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

try {
Expand Down
2 changes: 1 addition & 1 deletion kube/auth-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: node-app
image: dsdummies/auth-service:a1.01
image: dsdummies/auth-service:a1.02
ports:
- containerPort: 8000
env:
Expand Down
95 changes: 95 additions & 0 deletions kube/changes.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
diff --git a/Auth/Makefile b/Auth/Makefile
index a25cfa8..b5d9f4b 100644
--- a/Auth/Makefile
+++ b/Auth/Makefile
@@ -1,5 +1,5 @@
build:
- docker build --no-cache -t dsdummies/auth-service:a1.01 .
+ docker build --no-cache -t dsdummies/auth-service:a1.02 .

push:
- docker push dsdummies/auth-service:a1.01
+ docker push dsdummies/auth-service:a1.02
diff --git a/Client/.env.local b/Client/.env.local
index ebe255b..a1d5e9b 100644
--- a/Client/.env.local
+++ b/Client/.env.local
@@ -1,2 +1,2 @@
-REACT_APP_AUTH_API_URI = http://149.165.157.85:30000/api
-REACT_APP_CACHE_API_URI = http://149.165.157.85:32000/api
+REACT_APP_AUTH_API_URI = http://149.165.156.154:30000/api
+REACT_APP_CACHE_API_URI = http://149.165.156.154:32000/api
diff --git a/Client/Makefile b/Client/Makefile
index 4d1f277..a0edcee 100644
--- a/Client/Makefile
+++ b/Client/Makefile
@@ -1,5 +1,5 @@
build:
- docker build --no-cache -t dsdummies/client-react:a1.01 .
+ docker build --no-cache -t dsdummies/client-react:a1.02 .

push:
- docker push dsdummies/client-react:a1.01
+ docker push dsdummies/client-react:a1.02
diff --git a/cache/Makefile b/cache/Makefile
index 5d524dd..debaf78 100644
--- a/cache/Makefile
+++ b/cache/Makefile
@@ -1,2 +1,4 @@
build:
- docker build --no-cache -t cache-app .
\ No newline at end of file
+ docker build --no-cache -t dsdummies/cache-service:a1.02 .
+push:
+ 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 3b67937..652cbf3 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 ae4c36c..89e1b77 100644
--- a/cache/src/main/java/com/distsystems/main/Controller/WeatherDataController.java
+++ b/cache/src/main/java/com/distsystems/main/Controller/WeatherDataController.java
@@ -28,7 +28,7 @@ public class WeatherDataController {
}

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

try {
@@ -114,7 +114,7 @@ public class WeatherDataController {
}

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

try {
diff --git a/kube/auth-deployment.yaml b/kube/auth-deployment.yaml
index b5a0dc0..d202806 100644
--- a/kube/auth-deployment.yaml
+++ b/kube/auth-deployment.yaml
@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: node-app
- image: dsdummies/auth-service:a1.01
+ image: dsdummies/auth-service:a1.02
ports:
- containerPort: 8000
env:
diff --git a/kube/react-deployment.yaml b/kube/react-deployment.yaml
index 4ee97dc..221295b 100644
--- a/kube/react-deployment.yaml
+++ b/kube/react-deployment.yaml
@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: react-app
- image: dsdummies/client-react:a1.01
+ image: dsdummies/client-react:a1.02
ports:
- containerPort: 3000
imagePullPolicy: Always
2 changes: 1 addition & 1 deletion kube/data-ingestor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: di-app
image: dsdummies/data-ingestor:a1.02
image: dsdummies/data-ingestor:a1.03
ports:
- containerPort: 5678
imagePullPolicy: Always
2 changes: 1 addition & 1 deletion kube/react-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: react-app
image: dsdummies/client-react:a1.01
image: dsdummies/client-react:a1.02
ports:
- containerPort: 3000
imagePullPolicy: Always

0 comments on commit 6462ab2

Please sign in to comment.