Skip to content
Snippets Groups Projects
Verified Commit 0ea20c38 authored by Martin Weise's avatar Martin Weise
Browse files

Updated the compose file

parent e9670089
No related branches found
No related tags found
No related merge requests found
...@@ -78,7 +78,7 @@ services: ...@@ -78,7 +78,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-auth-service container_name: dbrepo-auth-service
hostname: auth-service hostname: auth-service
image: bitnami/keycloak:26.0.0-debian-12-r1 image: bitnami/keycloak:26.0.4-debian-12-r0
volumes: volumes:
- ./config/import-realms.sh:/docker-entrypoint-initdb.d/import-realms.sh - ./config/import-realms.sh:/docker-entrypoint-initdb.d/import-realms.sh
- ./config/master-realm.json:/opt/keycloak/data/import/master-realm.json - ./config/master-realm.json:/opt/keycloak/data/import/master-realm.json
...@@ -87,6 +87,7 @@ services: ...@@ -87,6 +87,7 @@ services:
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
KEYCLOAK_ENABLE_HEALTH_ENDPOINTS: "true"
KEYCLOAK_ENABLE_HTTPS: "false" KEYCLOAK_ENABLE_HTTPS: "false"
KEYCLOAK_ENABLE_STATISTICS: "true" KEYCLOAK_ENABLE_STATISTICS: "true"
KEYCLOAK_DATABASE_HOST: "auth-db" KEYCLOAK_DATABASE_HOST: "auth-db"
...@@ -305,10 +306,15 @@ services: ...@@ -305,10 +306,15 @@ services:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}" NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}"
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files" NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
NUXT_OIDC_PROVIDERS_KEYCLOAK_AUTHORIZATION_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/auth"
NUXT_OIDC_PROVIDERS_KEYCLOAK_BASE_URL: "${BASE_URL:-http://localhost}/realms/dbrepo"
NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_ID: "${AUTH_SERVICE_CLIENT:-dbrepo-client}" NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_ID: "${AUTH_SERVICE_CLIENT:-dbrepo-client}"
NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_SECRET: "${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}" NUXT_OIDC_PROVIDERS_KEYCLOAK_CLIENT_SECRET: "${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}"
NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI: "${BASE_URL:-http://localhost}/auth/keycloak/callback"
NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_REDIRECT_URI: "${BASE_URL:-http://localhost}" NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_REDIRECT_URI: "${BASE_URL:-http://localhost}"
NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/logout"
NUXT_OIDC_PROVIDERS_KEYCLOAK_REDIRECT_URI: "${BASE_URL:-http://localhost}/auth/keycloak/callback"
NUXT_OIDC_PROVIDERS_KEYCLOAK_TOKEN_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/token"
NUXT_OIDC_PROVIDERS_KEYCLOAK_USER_INFO_URL: "${BASE_URL:-http://localhost}/realms/dbrepo/protocol/openid-connect/userinfo"
depends_on: depends_on:
dbrepo-search-service: dbrepo-search-service:
condition: service_healthy condition: service_healthy
......
...@@ -41,7 +41,7 @@ upstream dashboard-service { ...@@ -41,7 +41,7 @@ upstream dashboard-service {
} }
upstream auth-service { upstream auth-service {
server auth-service:8080; server auth-service:8443;
} }
server { server {
......
ALTER TABLE mdb_users
DROP SYSTEM VERSIONING;
BEGIN;
ALTER TABLE mdb_users
ADD COLUMN keycloak_id character varying(36) NOT NULL;
UPDATE mdb_users
SET keycloak_id = id;
ALTER TABLE mdb_users
ADD CONSTRAINT UNIQUE (keycloak_id);
COMMIT;
ALTER TABLE mdb_users
ADD SYSTEM VERSIONING;
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
v-if="!inline" v-if="!inline"
:size="size" :size="size"
:color="color" :color="color"
:variant="chipVariant"> variant="outlined">
{{ status }} {{ status }}
</v-chip> </v-chip>
<span <span
...@@ -39,9 +39,6 @@ export default { ...@@ -39,9 +39,6 @@ export default {
if (!this.resource) { if (!this.resource) {
return null return null
} }
if (this.hasIdentifier) {
return 'pid'
}
if (!this.resource.is_public && !this.resource.is_schema_public) { if (!this.resource.is_public && !this.resource.is_schema_public) {
return 'draft' return 'draft'
} else if(!this.resource.is_public && this.resource.is_schema_public) { } else if(!this.resource.is_public && this.resource.is_schema_public) {
...@@ -60,12 +57,6 @@ export default { ...@@ -60,12 +57,6 @@ export default {
hasIdentifier () { hasIdentifier () {
return this.resource.identifiers?.length > 0 return this.resource.identifiers?.length > 0
}, },
chipVariant () {
if (this.hasIdentifier) {
return 'tonal'
}
return 'outlined'
},
color () { color () {
if (this.hasIdentifier) { if (this.hasIdentifier) {
return 'info' return 'info'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment