- Added dev & prod properties

- Update properties
MichiBaum · Dec 10, 2023 · 575e389 · 575e389
1 parent 87e17f8
commit 575e389
Show file tree

Hide file tree

Showing 25 changed files with 140 additions and 40 deletions.
diff --git a/admin-service/pom.xml b/admin-service/pom.xml
@@ -77,12 +77,15 @@
 					<excludeDevtools>true</excludeDevtools>
 					<optimizedLaunch>true</optimizedLaunch>
 					<image>
+						<!--suppress UnresolvedMavenProperty -->
 						<name>registry.hub.docker.com/${dockerHub.username}/${project.artifactId}:${project.version}</name>
 						<publish>true</publish>
 					</image>
 					<docker>
 						<publishRegistry>
+							<!--suppress UnresolvedMavenProperty -->
 							<username>${dockerHub.username}</username>
+							<!--suppress UnresolvedMavenProperty -->
 							<password>${dockerHub.password}</password>
 							<url>${dockerHub.url}</url>
 						</publishRegistry>
@@ -98,8 +101,8 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
 				<configuration>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 				</configuration>

diff --git a/admin-service/src/main/resources/application-dev.yml b/admin-service/src/main/resources/application-dev.yml
@@ -0,0 +1,13 @@
+server:
+  port: 8082
+
+spring:
+  boot:
+    admin:
+      ui:
+        public-url: http://localhost:8082
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka
diff --git a/admin-service/src/main/resources/application-prod.yml b/admin-service/src/main/resources/application-prod.yml
@@ -0,0 +1,13 @@
+server:
+  port: 80
+
+spring:
+  boot:
+    admin:
+      ui:
+        public-url: http://admin.michibaum.ch
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://registry-service:8761/eureka
diff --git a/admin-service/src/main/resources/application.yml b/admin-service/src/main/resources/application.yml
@@ -14,8 +14,6 @@ spring:
         enabled: true
       ui:
         title: Admin Server
-        # Public URL because of Gateway
-        public-url: http://admin.michibaum.ch
       monitor:
         status-interval: 3s
         status-lifetime: 3s
@@ -33,9 +31,6 @@ spring:
     allow-bean-definition-overriding: true
 
 eureka:
-  client:
-    service-url:
-      defaultZone: http://registry-service:8761/eureka
   instance:
     prefer-ip-address: true
 

diff --git a/authentication-service/pom.xml b/authentication-service/pom.xml
@@ -59,6 +59,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -101,12 +105,15 @@
                     <excludeDevtools>true</excludeDevtools>
                     <optimizedLaunch>true</optimizedLaunch>
                     <image>
+                        <!--suppress UnresolvedMavenProperty -->
                         <name>registry.hub.docker.com/${dockerHub.username}/${project.artifactId}:${project.version}</name>
                         <publish>true</publish>
                     </image>
                     <docker>
                         <publishRegistry>
+                            <!--suppress UnresolvedMavenProperty -->
                             <username>${dockerHub.username}</username>
+                            <!--suppress UnresolvedMavenProperty -->
                             <password>${dockerHub.password}</password>
                             <url>${dockerHub.url}</url>
                         </publishRegistry>
@@ -122,8 +129,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
                 <configuration>
                     <failOnNoGitDirectory>false</failOnNoGitDirectory>
                 </configuration>

diff --git a/authentication-service/src/main/resources/application-dev.yml b/authentication-service/src/main/resources/application-dev.yml
@@ -0,0 +1,7 @@
+server:
+  port: 8083
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka
diff --git a/authentication-service/src/main/resources/application-prod.yml b/authentication-service/src/main/resources/application-prod.yml
@@ -0,0 +1,7 @@
+server:
+  port: 80
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://registry-service:8761/eureka
diff --git a/authentication-service/src/main/resources/application.yml b/authentication-service/src/main/resources/application.yml
@@ -26,9 +26,6 @@ spring:
       dll-auto: update
 
 eureka:
-  client:
-    service-url:
-      defaultZone: http://registry-service:8761/eureka
   instance:
     prefer-ip-address: true
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,8 @@ services:
   registry-service:
     image: 70131370/registry-service:1.0.0-TEST-4
     restart: always
+    environment:
+      spring_profiles_active: prod
     expose:
       - "8761"
     networks:
@@ -15,8 +17,10 @@ services:
     restart: always
     depends_on:
       - registry-service
+    environment:
+      spring_profiles_active: prod
     expose:
-      - "8080"
+      - "80"
     networks:
       - microservice-network
 
@@ -25,8 +29,10 @@ services:
     restart: always
     depends_on:
       - registry-service
+    environment:
+      spring_profiles_active: prod
     expose:
-      - "8080"
+      - "80"
     networks:
       - microservice-network
 
@@ -35,15 +41,18 @@ services:
     restart: always
     depends_on:
       - registry-service
+    environment:
+      spring_profiles_active: prod
     expose:
-      - "8080"
+      - "80"
     networks:
       - microservice-network
 
   authentication-db:
     image: mysql:8.0
     restart: always
     environment:
+      spring_profiles_active: prod
       MYSQL_ROOT_PASSWORD: ${AUTHENTICATION_DB_PASSWORD}
       MYSQL_DATABASE: ${AUTHENTICATION_DB}
     expose:
@@ -57,18 +66,20 @@ services:
     depends_on:
       - registry-service
       - usermanagement-db
-    expose:
-      - "8080"
     environment:
+      spring_profiles_active: prod
       DATABASE_PASSWORD: ${USERMANAGEMENT_DB_PASSWORD}
       DATABASE: ${USERMANAGEMENT_DB}
+    expose:
+      - "80"
     networks:
       - microservice-network
 
   usermanagement-db:
     image: mysql:8.0
     restart: always
     environment:
+      spring_profiles_active: prod
       MYSQL_ROOT_PASSWORD: ${USERMANAGEMENT_DB_PASSWORD}
       MYSQL_DATABASE: ${USERMANAGEMENT_DB}
     expose:
@@ -87,6 +98,8 @@ services:
       - admin-service
     ports:
       - "80:80"
+    environment:
+      spring_profiles_active: prod
     expose:
       - "80"
     networks:

diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
@@ -71,12 +71,15 @@
 					<excludeDevtools>true</excludeDevtools>
 					<optimizedLaunch>true</optimizedLaunch>
 					<image>
+						<!--suppress UnresolvedMavenProperty -->
 						<name>registry.hub.docker.com/${dockerHub.username}/${project.artifactId}:${project.version}</name>
 						<publish>true</publish>
 					</image>
 					<docker>
 						<publishRegistry>
+							<!--suppress UnresolvedMavenProperty -->
 							<username>${dockerHub.username}</username>
+							<!--suppress UnresolvedMavenProperty -->
 							<password>${dockerHub.password}</password>
 							<url>${dockerHub.url}</url>
 						</publishRegistry>
@@ -92,8 +95,8 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
 				<configuration>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 				</configuration>

diff --git a/gateway-service/src/main/resources/application-dev.yml b/gateway-service/src/main/resources/application-dev.yml
@@ -0,0 +1,4 @@
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka
diff --git a/gateway-service/src/main/resources/application-prod.yml b/gateway-service/src/main/resources/application-prod.yml
@@ -0,0 +1,4 @@
+eureka:
+  client:
+    service-url:
+      defaultZone: http://registry-service:8761/eureka
diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
@@ -25,9 +25,6 @@ spring:
 
 
 eureka:
-  client:
-    service-url:
-      defaultZone: http://registry-service:8761/eureka
   instance:
     prefer-ip-address: true
 

diff --git a/javadoc-service/pom.xml b/javadoc-service/pom.xml
@@ -72,12 +72,15 @@
 					<excludeDevtools>true</excludeDevtools>
 					<optimizedLaunch>true</optimizedLaunch>
 					<image>
+						<!--suppress UnresolvedMavenProperty -->
 						<name>registry.hub.docker.com/${dockerHub.username}/${project.artifactId}:${project.version}</name>
 						<publish>true</publish>
 					</image>
 					<docker>
 						<publishRegistry>
+							<!--suppress UnresolvedMavenProperty -->
 							<username>${dockerHub.username}</username>
+							<!--suppress UnresolvedMavenProperty -->
 							<password>${dockerHub.password}</password>
 							<url>${dockerHub.url}</url>
 						</publishRegistry>
@@ -93,8 +96,8 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
+				<groupId>io.github.git-commit-id</groupId>
+				<artifactId>git-commit-id-maven-plugin</artifactId>
 				<configuration>
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 				</configuration>

diff --git a/javadoc-service/src/main/resources/application-dev.yml b/javadoc-service/src/main/resources/application-dev.yml
@@ -0,0 +1,7 @@
+server:
+  port: 8081
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka
diff --git a/javadoc-service/src/main/resources/application-prod.yml b/javadoc-service/src/main/resources/application-prod.yml
@@ -0,0 +1,7 @@
+server:
+  port: 80
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://registry-service:8761/eureka
diff --git a/javadoc-service/src/main/resources/application.yml b/javadoc-service/src/main/resources/application.yml
@@ -18,9 +18,6 @@ spring:
 
 
 eureka:
-  client:
-    service-url:
-      defaultZone: http://registry-service:8761/eureka
   instance:
     prefer-ip-address: true
 

diff --git a/registry-service/pom.xml b/registry-service/pom.xml
@@ -73,12 +73,15 @@
                     <excludeDevtools>true</excludeDevtools>
                     <optimizedLaunch>true</optimizedLaunch>
                     <image>
+                        <!--suppress UnresolvedMavenProperty -->
                         <name>registry.hub.docker.com/${dockerHub.username}/${project.artifactId}:${project.version}</name>
                         <publish>true</publish>
                     </image>
                     <docker>
                         <publishRegistry>
+                            <!--suppress UnresolvedMavenProperty -->
                             <username>${dockerHub.username}</username>
+                            <!--suppress UnresolvedMavenProperty -->
                             <password>${dockerHub.password}</password>
                             <url>${dockerHub.url}</url>
                         </publishRegistry>
@@ -94,8 +97,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
                 <configuration>
                     <failOnNoGitDirectory>false</failOnNoGitDirectory>
                 </configuration>

diff --git a/registry-service/src/main/resources/application-dev.yml b/registry-service/src/main/resources/application-dev.yml
@@ -0,0 +1,4 @@
+eureka:
+  client:
+    service-url:
+      defaultZone: http://localhost:8761/eureka
diff --git a/registry-service/src/main/resources/application-prod.yml b/registry-service/src/main/resources/application-prod.yml
@@ -0,0 +1,4 @@
+eureka:
+  client:
+    service-url:
+      defaultZone: http://registry-service:8761/eureka
diff --git a/registry-service/src/main/resources/application.yml b/registry-service/src/main/resources/application.yml
@@ -21,8 +21,6 @@ eureka:
   client:
     register-with-eureka: false
     fetch-registry: false
-    service-url:
-      defaultZone: http://registry-service:8761/eureka
 
 management:
   endpoints: