diff --git a/.docker/.env b/.docker/.env index 01d1ace194e18a98d30e02062a69d8165c4abccf..f72626ab5ef38013f5672b522006ea410925ead0 100644 --- a/.docker/.env +++ b/.docker/.env @@ -1,4 +1,4 @@ -APP_VERSION=1.9.0 +APP_VERSION=1.9 FLUENTBIT_VERSION=4.0.0 GRAFANA_VERSION=11.4.0 MARIADB_VERSION=11.3.2 diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 62a8c127a1126a30fc7b2fe8ddc1b5bcf5782f42..07e64f048e21508dcdbee0c132b698e72d160aea 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -177,7 +177,7 @@ services: init: true restart: "no" container_name: dbrepo-auth-service-init - image: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:${APP_VERSION} environment: AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080} METADATA_DB: "${METADATA_DB:-dbrepo}" @@ -200,7 +200,7 @@ services: restart: "no" container_name: dbrepo-metadata-service hostname: metadata-service - image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:${APP_VERSION} environment: ADMIN_EMAIL: "${ADMIN_EMAIL:-noreply@localhost}" ANALYSE_SERVICE_ENDPOINT: "${ANALYSE_SERVICE_ENDPOINT:-http://analyse-service:8080}" @@ -262,7 +262,7 @@ services: restart: "no" container_name: dbrepo-analyse-service hostname: analyse-service - image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:${APP_VERSION} environment: AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} @@ -326,7 +326,7 @@ services: restart: "no" container_name: dbrepo-search-service hostname: search-service - image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/search-service:${APP_VERSION} environment: AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client} AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG} @@ -348,7 +348,7 @@ services: restart: "no" container_name: dbrepo-ui hostname: ui - image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/ui:${APP_VERSION} environment: NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}" NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}" @@ -426,7 +426,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.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:${APP_VERSION} environment: LOG_LEVEL: ${LOG_LEVEL:-info} METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080} @@ -447,7 +447,7 @@ services: init: true container_name: dbrepo-dashboard-service-init hostname: search-dashboard-init - image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:${APP_VERSION} environment: LOG_LEVEL: ${LOG_LEVEL:-info} DASHBOARD_UI_ENDPOINT: "${DASHBOARD_UI_ENDPOINT:-http://dashboard-ui:3000}" @@ -498,7 +498,7 @@ services: init: true container_name: dbrepo-storage-service-init hostname: storage-service-init - image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:${APP_VERSION} environment: S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin} S3_BUCKET: "${S3_BUCKET:-dbrepo}" @@ -514,7 +514,7 @@ services: restart: "no" container_name: dbrepo-data-service hostname: data-service - image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/data-service:${APP_VERSION} environment: AUTH_SERVICE_CLIENT: "${AUTH_SERVICE_CLIENT:-dbrepo-client}" AUTH_SERVICE_CLIENT_SECRET: "${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}" @@ -593,7 +593,7 @@ services: restart: "no" container_name: dbrepo-dashboard-service hostname: dashboard-service - image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.9.0 + image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:${APP_VERSION} environment: AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080} BASE_URL: "${BASE_URL:-http://localhost}" diff --git a/install.sh b/install.sh index ea273c5f332d061649ca92750c3b44585ea042d5..66c27fbfc732f75ad068de83eec340fd471f4cd0 100644 --- a/install.sh +++ b/install.sh @@ -1,7 +1,6 @@ #!/bin/bash # preset -VERSION="1.9.0" MIN_CPU=8 MIN_RAM=10 SKIP_CHECKS=${SKIP_CHECKS:-0}