Changed clouddev to dev-docker profiles then removed server.port

crss-admin-clouddev.yml → crss-admin-dev-docker.yml

@@ -17,8 +17,6 @@ spring:
       javax.persistence.schema-generation.scripts.action: drop-and-create
       javax.persistence.schema-generation.scripts.create-target: target/create.sql
       javax.persistence.schema-generation.scripts.drop-target: target/drop.sql
-server:
-  port: 8082
 
 graylog:
   host: localhost

crss-reg-dev-docker.yml

@@ -0,0 +1,37 @@
+spring:
+  datasource:
+    platform: postgres
+    url: jdbc:postgresql://db:5432/crss_reg
+    username: crss_reg
+    password: crss_reg
+    driverClassName: org.postgresql.Driver
+  jpa:
+    database: POSTGRESQL
+    show-sql: true
+    hibernate:
+      ddl-auto: none
+    properties:
+      jadira.usertype.autoRegisterUserTypes: true
+      javax.persistence.schema-generation.database.action: none
+      javax.persistence.schema-generation.create-source: metadata
+      javax.persistence.schema-generation.scripts.action: drop-and-create
+      javax.persistence.schema-generation.scripts.create-target: create.sql
+      javax.persistence.schema-generation.scripts.drop-target: drop.sql
+  mail:
+    host: smtp.gmail.com
+    port: 587
+    username: demo.exist.pemc@gmail.com
+    # please provide the password
+    password: $pockTest
+    properties:
+      mail.smtp.auth: true
+      mail.debug: true
+      mail.smtp.starttlls.enable: true
+      mail.smtp.starttls.required: true
+  #we dont need spring mvc here
+  freemarker:
+    enabled: false
+    template-loader-path: classpath:/mail/templates
+
+graylog:
+  host: localhost

crss-reg-dev.yml

@@ -35,5 +35,17 @@ spring:
 server:
   port: 8081
 
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+    resource:
+      userInfoUri: http://localhost:8082/user
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+
 graylog:
-  host: localhost
+  host: localhost

crss-reg.yml

@@ -12,19 +12,19 @@ app:
 security:
   oauth2:
     client:
-      accessTokenUri: http://localhost:8082/oauth/access_token
-      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      accessTokenUri: http://app:8080/oauth/access_token
+      userAuthorizationUri: http://app:8080/oauth/authorize
       clientId: crss
       clientSecret: crsssecret
       authorized-grant-types: authorization_code,refresh_token,password
       scope: openid
       access-token-validity-seconds: 3600
     resource:
-      userInfoUri: http://localhost:8082/user
+      userInfoUri: http://app:8080/user
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://discovery:8080/eureka/
 #    healthcheck:
 #      enabled: true
     lease: