Skip to content

Commit c1ee1d4

Browse files
author
Matt Raible
committed
Updates after QA
1 parent 0cdffc5 commit c1ee1d4

File tree

16 files changed

+34758
-348
lines changed

16 files changed

+34758
-348
lines changed

jhipster-k8s/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.env

jhipster-k8s/docker-compose/central-server-config/application.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,4 @@ eureka:
1313
service-url:
1414
defaultZone: http://admin:${jhipster.registry.password}@jhipster-registry:8761/eureka/
1515

16-
spring:
17-
security:
18-
oauth2:
19-
client:
20-
provider:
21-
oidc:
22-
issuer-uri: https://dev-9323263.okta.com/oauth2/default
23-
registration:
24-
oidc:
25-
client-id: 0oad5396lBEI2sVhv5d6
26-
client-secret: xjmJiYM4HuH48CJZ-4QMQS9ZOSUCGhrzade4ONmf
16+

jhipster-k8s/docker-compose/docker-compose.yml

+2-38
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "3.8"
21
services:
32
gateway:
43
image: gateway
@@ -16,7 +15,7 @@ services:
1615
- JHIPSTER_SLEEP=30
1716
- JHIPSTER_REGISTRY_PASSWORD=admin
1817
ports:
19-
- "8080:8080:8080"
18+
- "8080:8080"
2019
gateway-postgresql:
2120
image: postgres:13.2
2221
environment:
@@ -63,51 +62,16 @@ services:
6362

6463
jhipster-registry:
6564
image: jhipster/jhipster-registry:v6.7.1
66-
volumes:
67-
- ./central-server-config:/central-config
68-
# By default the JHipster Registry runs with the "dev" and "native"
69-
# Spring profiles.
70-
# "native" profile means the filesystem is used to store data, see
71-
# http://cloud.spring.io/spring-cloud-config/spring-cloud-config.html
7265
environment:
7366
- _JAVA_OPTIONS=-Xmx512m -Xms256m
7467
- JHIPSTER_SLEEP=20
7568
- SPRING_PROFILES_ACTIVE=dev,oauth2
7669
- SPRING_SECURITY_USER_PASSWORD=admin
7770
- JHIPSTER_REGISTRY_PASSWORD=admin
78-
# - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=native
79-
# - SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_SEARCH_LOCATIONS=file:./central-config
71+
- ENCRYPT_KEY=${ENCRYPT_KEY}
8072
- SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git
8173
- SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI=https://github.com/mraible/reactive-java-ms-config/
8274
- SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_SEARCH_PATHS=config
8375
- SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_LABEL=main
84-
- ENCRYPT_KEY=${ENCRYPT_KEY}
85-
# For Keycloak to work, you need to add '127.0.0.1 keycloak' to your hosts file
86-
# - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_OIDC_ISSUER_URI=http://keycloak:9080/auth/realms/jhipster
87-
# - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_ID=jhipster-registry
88-
# - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_OIDC_CLIENT_SECRET=jhipster-registry
8976
ports:
9077
- 8761:8761
91-
keycloak:
92-
image: jboss/keycloak:12.0.4
93-
command:
94-
[
95-
"-b",
96-
"0.0.0.0",
97-
"-Dkeycloak.migration.action=import",
98-
"-Dkeycloak.migration.provider=dir",
99-
"-Dkeycloak.migration.dir=/opt/jboss/keycloak/realm-config",
100-
"-Dkeycloak.migration.strategy=OVERWRITE_EXISTING",
101-
"-Djboss.socket.binding.port-offset=1000",
102-
"-Dkeycloak.profile.feature.upload_scripts=enabled",
103-
]
104-
volumes:
105-
- ./realm-config:/opt/jboss/keycloak/realm-config
106-
environment:
107-
- KEYCLOAK_USER=admin
108-
- KEYCLOAK_PASSWORD=admin
109-
- DB_VENDOR=h2
110-
ports:
111-
- 9080:9080
112-
- 9443:9443
113-
- 10990:10990

0 commit comments

Comments
 (0)