Skip to content
Snippets Groups Projects

Dev

Merged Martin Weise requested to merge dev into master
74 files
+ 5715
1486
Compare changes
  • Side-by-side
  • Inline

Files

+ 12
9
@@ -111,7 +111,7 @@ services:
@@ -111,7 +111,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.5.2
volumes:
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
environment:
@@ -174,7 +174,7 @@ services:
@@ -174,7 +174,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.5.2
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}
@@ -229,7 +229,7 @@ services:
@@ -229,7 +229,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.5.2
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
@@ -253,7 +253,7 @@ services:
@@ -253,7 +253,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.5.2
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}
@@ -275,7 +275,7 @@ services:
@@ -275,7 +275,7 @@ 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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.5.2
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://localhost}"
@@ -345,7 +345,7 @@ services:
@@ -345,7 +345,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5.2
environment:
environment:
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
@@ -400,7 +400,7 @@ services:
@@ -400,7 +400,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.5.2
ports:
ports:
- "3000:3000"
- "3000:3000"
volumes:
volumes:
@@ -428,7 +428,7 @@ services:
@@ -428,7 +428,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5.2
environment:
environment:
WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -443,10 +443,13 @@ services:
@@ -443,10 +443,13 @@ services:
container_name: dbrepo-upload-service
container_name: dbrepo-upload-service
hostname: upload-service
hostname: upload-service
image: docker.io/tusproject/tusd:v2.4.0
image: docker.io/tusproject/tusd:v2.4.0
 
volumes:
 
- "./config/pre-create.sh:/srv/tusd-hooks/pre-create:ro"
command:
command:
- "-behind-proxy"
- "-behind-proxy"
- "-max-size=2000000000"
- "-max-size=2000000000"
- "-base-path=/api/upload/files/"
- "-base-path=/api/upload/files/"
 
- "-hooks-dir=/srv/tusd-hooks/"
- "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}"
- "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}"
- "-s3-bucket=dbrepo"
- "-s3-bucket=dbrepo"
environment:
environment:
@@ -468,7 +471,7 @@ services:
@@ -468,7 +471,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.5.0
image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.5.2
volumes:
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
environment:
Loading