diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index a9565d9f01fa6f40d55db5606483ab8412cdd9d7..7817c84c7f6da1e595b076148cc8bdc105cdda08 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -14,7 +14,7 @@ services: restart: "no" container_name: dbrepo-metadata-db hostname: metadata-db - image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8 + image: docker.io/bitnami/mariadb-galera:11.3.2-debian-12-r9 volumes: - metadata-db-data:/bitnami/mariadb - ./config/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql @@ -37,7 +37,7 @@ services: restart: "no" container_name: dbrepo-data-db hostname: data-db - image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8 + image: docker.io/bitnami/mariadb-galera:11.3.2-debian-12-r9 volumes: - data-db-data:/bitnami/mariadb - "${SHARED_VOLUME:-/tmp}:/tmp" @@ -114,6 +114,9 @@ services: AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin} AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin} AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080} + METADATA_DB: "${METADATA_DB:-dbrepo}" + METADATA_DB_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}" + METADATA_USERNAME: "root" SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}" depends_on: dbrepo-auth-service: @@ -127,7 +130,7 @@ services: restart: "no" container_name: dbrepo-metadata-service hostname: metadata-service - image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.0 volumes: - "${SHARED_VOLUME:-/tmp}:/tmp" environment: @@ -190,7 +193,7 @@ services: restart: "no" container_name: dbrepo-analyse-service hostname: analyse-service - image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.0 environment: AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} @@ -245,7 +248,7 @@ services: restart: "no" container_name: dbrepo-search-db hostname: search-db - image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.0 healthcheck: test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP interval: 10s @@ -269,7 +272,7 @@ services: restart: "no" container_name: dbrepo-search-service hostname: search-service - image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.0 environment: AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} @@ -291,7 +294,7 @@ services: restart: "no" container_name: dbrepo-ui hostname: ui - image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.0 environment: NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}" @@ -360,7 +363,7 @@ services: init: true container_name: dbrepo-search-service-init hostname: search-service-init - image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.0 environment: METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080} OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db} @@ -414,7 +417,7 @@ services: restart: "no" container_name: dbrepo-dashboard-service hostname: dashboard-service - image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.0 ports: - "3000:3000" volumes: @@ -441,10 +444,12 @@ services: init: true container_name: dbrepo-storage-service-init hostname: storage-service-init - image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.0 environment: - WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}" + S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin} S3_BUCKET: "${S3_BUCKET:-dbrepo}" + S3_SECRET_ACCESS_KEY: ${S3_SECRET_ACCESS_KEY:-seaweedfsadmin} + STORAGE_ENDPOINT: ${STORAGE_ENDPOINT:-http://storage-service:9000} depends_on: dbrepo-storage-service: condition: service_healthy @@ -484,7 +489,7 @@ services: restart: "no" container_name: dbrepo-data-service hostname: data-service - image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5.3 + image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.0 volumes: - "${SHARED_VOLUME:-/tmp}:/tmp" environment: