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

Fix lints

parent a67401c7
No related branches found
No related tags found
1 merge request!374Bumped version of DBRepo
...@@ -78,11 +78,12 @@ services: ...@@ -78,11 +78,12 @@ 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:24.0.5-debian-12-r8
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
- ./config/dbrepo-realm.json:/opt/keycloak/data/import/dbrepo-realm.json - ./config/dbrepo-realm.json:/opt/keycloak/data/import/dbrepo-realm.json
- ./config/create-event-listener.jar:/opt/bitnami/keycloak/providers/create-event-listener.jar
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
...@@ -92,6 +93,9 @@ services: ...@@ -92,6 +93,9 @@ services:
KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}" KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}"
KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}" KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}" KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}/api/user"
SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
healthcheck: healthcheck:
test: curl -fsS http://localhost:8080/realms/master test: curl -fsS http://localhost:8080/realms/master
interval: 10s interval: 10s
...@@ -109,7 +113,7 @@ services: ...@@ -109,7 +113,7 @@ services:
init: true init: true
restart: "no" restart: "no"
container_name: dbrepo-auth-service-init container_name: dbrepo-auth-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.3
environment: environment:
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin} AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin} AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
...@@ -130,7 +134,7 @@ services: ...@@ -130,7 +134,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-metadata-service container_name: dbrepo-metadata-service
hostname: metadata-service hostname: metadata-service
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.3
volumes: volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp" - "${SHARED_VOLUME:-/tmp}:/tmp"
environment: environment:
...@@ -193,7 +197,7 @@ services: ...@@ -193,7 +197,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-analyse-service container_name: dbrepo-analyse-service
hostname: analyse-service hostname: analyse-service
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.3
environment: environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
...@@ -248,7 +252,7 @@ services: ...@@ -248,7 +252,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-search-db container_name: dbrepo-search-db
hostname: search-db hostname: search-db
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.3
healthcheck: healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s interval: 10s
...@@ -272,7 +276,7 @@ services: ...@@ -272,7 +276,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.3
environment: environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
...@@ -296,11 +300,16 @@ services: ...@@ -296,11 +300,16 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-ui container_name: dbrepo-ui
hostname: ui hostname: ui
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.3
environment: environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}" 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_BASE_URL: "${BASE_URL:-http://localhost:8080}/realms/dbrepo"
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_REDIRECT_URI: "${BASE_URL:-http://localhost}/auth/keycloak/callback"
NUXT_OIDC_PROVIDERS_KEYCLOAK_LOGOUT_REDIRECT_URI: "${BASE_URL:-http://localhost}"
depends_on: depends_on:
dbrepo-search-service: dbrepo-search-service:
condition: service_healthy condition: service_healthy
...@@ -311,6 +320,8 @@ services: ...@@ -311,6 +320,8 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 12 retries: 12
extra_hosts:
- "localhost:host-gateway"
logging: logging:
driver: json-file driver: json-file
...@@ -365,7 +376,7 @@ services: ...@@ -365,7 +376,7 @@ services:
init: true init: true
container_name: dbrepo-search-service-init container_name: dbrepo-search-service-init
hostname: search-service-init hostname: search-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.3
environment: environment:
LOG_LEVEL: ${LOG_LEVEL:-info} LOG_LEVEL: ${LOG_LEVEL:-info}
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080} METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
...@@ -422,7 +433,7 @@ services: ...@@ -422,7 +433,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-dashboard-service container_name: dbrepo-dashboard-service
hostname: dashboard-service hostname: dashboard-service
image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.3
ports: ports:
- "3000:3000" - "3000:3000"
volumes: volumes:
...@@ -449,7 +460,7 @@ services: ...@@ -449,7 +460,7 @@ services:
init: true init: true
container_name: dbrepo-storage-service-init container_name: dbrepo-storage-service-init
hostname: storage-service-init hostname: storage-service-init
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.3
environment: environment:
S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin} S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin}
S3_BUCKET: "${S3_BUCKET:-dbrepo}" S3_BUCKET: "${S3_BUCKET:-dbrepo}"
...@@ -479,6 +490,7 @@ services: ...@@ -479,6 +490,7 @@ services:
AWS_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}" AWS_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
AWS_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}" AWS_SECRET_ACCESS_KEY: "${S3_SECRET_ACCESS_KEY:-seaweedfsadmin}"
AWS_REGION: "${STORAGE_REGION_NAME:-default}" AWS_REGION: "${STORAGE_REGION_NAME:-default}"
METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}"
depends_on: depends_on:
dbrepo-storage-service: dbrepo-storage-service:
condition: service_healthy condition: service_healthy
...@@ -494,7 +506,7 @@ services: ...@@ -494,7 +506,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-data-service container_name: dbrepo-data-service
hostname: data-service hostname: data-service
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.2 image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.3
volumes: volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp" - "${SHARED_VOLUME:-/tmp}:/tmp"
environment: environment:
......
...@@ -6,7 +6,6 @@ CREATE TABLE IF NOT EXISTS `mdb_users` ...@@ -6,7 +6,6 @@ CREATE TABLE IF NOT EXISTS `mdb_users`
username character varying(255) NOT NULL, username character varying(255) NOT NULL,
firstname character varying(255), firstname character varying(255),
lastname character varying(255), lastname character varying(255),
email character varying(255) NOT NULL,
orcid character varying(255), orcid character varying(255),
affiliation character varying(255), affiliation character varying(255),
is_internal BOOLEAN NOT NULL DEFAULT FALSE, is_internal BOOLEAN NOT NULL DEFAULT FALSE,
...@@ -14,8 +13,7 @@ CREATE TABLE IF NOT EXISTS `mdb_users` ...@@ -14,8 +13,7 @@ CREATE TABLE IF NOT EXISTS `mdb_users`
theme character varying(255) NOT NULL default ('light'), theme character varying(255) NOT NULL default ('light'),
language character varying(3) NOT NULL default ('en'), language character varying(3) NOT NULL default ('en'),
PRIMARY KEY (id), PRIMARY KEY (id),
UNIQUE (username), UNIQUE (username)
UNIQUE (email)
) WITH SYSTEM VERSIONING; ) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_images` CREATE TABLE IF NOT EXISTS `mdb_images`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment