BREAKING: updating all docker images

philipdaquin · Oct 10, 2023 · 0e396df · 0e396df
1 parent e629c2e
commit 0e396df
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/api_gateway/pom.xml b/api_gateway/pom.xml
@@ -23,6 +23,11 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 			<version>4.0.3</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-gateway</artifactId>
+			<version>4.0.3</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -54,14 +59,10 @@
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core-micrometer</artifactId>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>

diff --git a/api_gateway/src/main/resources/application-dev.yml b/api_gateway/src/main/resources/application-dev.yml
@@ -133,7 +133,8 @@ eureka:
     healthcheck:
       enabled: true
     serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
+      # defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://discovery-service:8761/eureka/
 
 management: 
   health:

diff --git a/api_gateway/src/main/resources/application-docker.yml b/api_gateway/src/main/resources/application-docker.yml
@@ -10,20 +10,22 @@ spring:
 
     gateway:
       default-filters:
-      - SaveSession
-      - TokenRelay
-      - name: RequestRateLimiter
-        args:
-          redis-rate-limiter:
-            replenishRate: 10
-            burstCapacity: 20
-            requestedTokens: 1
+      # - SaveSession
+      # - TokenRelay
+      # - name: RequestRateLimiter
+      #   args:
+      #     redis-rate-limiter:
+      #       replenishRate: 10
+      #       burstCapacity: 20
+      #       requestedTokens: 1
       httpclient:
         ssl:
           use-insecure-trust-manager: true
       discovery:
         locator:
+
           enabled: true
+
 
       routes:
       # Id - Every route requires a unique identifer 
@@ -178,7 +180,6 @@ management:
 
 eureka:
   instance:
-    hostname: localhost
     prefer-ip-address: true
   client:
     enabled: true
@@ -187,7 +188,7 @@ eureka:
     healthcheck:
       enabled: true
     serviceUrl:
-      defaultZone: http://discovery-service:8761/eureka/
+      defaultZone: ${eureka_url:http://discovery-service:8761/eureka/}
 
 logging:
   pattern: