@@ -53,6 +53,7 @@ services:
5353 DATAVERSE_AUTH_OIDC_CLIENT_ID : test
5454 DATAVERSE_AUTH_OIDC_CLIENT_SECRET : 94XHrfNRwXsjqTqApRrwWmhDLDHpIYV8
5555 DATAVERSE_AUTH_OIDC_AUTH_SERVER_URL : http://keycloak.mydomain.com:9080/realms/test
56+ DATAVERSE_FEATURE_API_BEARER_AUTH_USE_BUILTIN_USER_ON_ID_MATCH : 1
5657 JVM_ARGS : -Ddataverse.pid.providers=fake
5758 -Ddataverse.pid.default-provider=fake
5859 -Ddataverse.pid.fake.type=FAKE
@@ -182,28 +183,50 @@ services:
182183 - /mail:mode=770,size=128M,uid=1000,gid=1000
183184
184185 dev_keycloak :
185- container_name : ' dev_keycloak'
186- image : ' quay.io/keycloak/keycloak:21.0'
186+ container_name : " dev_keycloak"
187+ build :
188+ context : ./keycloak
189+ dockerfile : Dockerfile
190+ image : gdcc/keycloak
187191 hostname : keycloak
188- command :
189- - ' start-dev'
190- - ' --import-realm'
191192 environment :
192- - KC_HTTP_PORT=9080
193- - KC_HOSTNAME=localhost
194- - KC_HOSTNAME_PORT=8000
195- - KC_HOSTNAME_ADMIN_URL=http://localhost:8000
196193 - KEYCLOAK_ADMIN=kcadmin
197194 - KEYCLOAK_ADMIN_PASSWORD=kcpassword
198195 - KEYCLOAK_LOGLEVEL=DEBUG
196+ - KC_HOSTNAME_STRICT=false
197+ - KC_HOSTNAME=localhost
198+ - KC_HTTP_PORT=9080
199+ - KC_DB=postgres
200+ - KC_DB_URL=jdbc:postgresql://postgres:5432/dataverse
201+ - KC_DB_USERNAME=${DATAVERSE_DB_USER}
202+ - KC_DB_PASSWORD=secret
203+ - DATAVERSE_DB_HOST=postgres
204+ - DATAVERSE_DB_PORT=5432
205+ - DATAVERSE_DB_USER=${DATAVERSE_DB_USER}
206+ - DATAVERSE_DB_PASSWORD=secret
207+ - DATAVERSE_BASE_URL=http://dataverse:8080
199208 networks :
200209 dataverse :
201210 aliases :
202211 - keycloak.mydomain.com
212+ command : start-dev --verbose --import-realm
203213 expose :
204- - 9080
214+ - ' 9000'
215+ - ' 9080'
216+
217+ dev_keycloak_initializer :
218+ image : alpine:latest
219+ container_name : " dev_keycloak_initializer"
220+ depends_on :
221+ - dev_keycloak
222+ environment :
223+ - KEYCLOAK_ADMIN=kcadmin
224+ - KEYCLOAK_ADMIN_PASSWORD=kcpassword
205225 volumes :
206- - ' ./keycloak/test-realm.json:/opt/keycloak/data/import/test-realm.json'
226+ - ./keycloak/setup-spi.sh:/usr/local/bin/setup-spi.sh
227+ command : [ "/bin/sh", "-c", "apk add --no-cache curl jq && /usr/local/bin/setup-spi.sh" ]
228+ networks :
229+ - dataverse
207230
208231networks :
209232 dataverse :
0 commit comments