diff --git a/dbrepo-upload-service/README.md b/dbrepo-upload-service/README.md deleted file mode 100644 index a8d1e38506fc48b28470b7723de7c76f64865874..0000000000000000000000000000000000000000 --- a/dbrepo-upload-service/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Upload Service - -## Actuator - -- Info: http://localhost:1080 -- Prometheus: http://localhost:1080/metrics - -## TUS - -- File upload: http://localhost:1080/api/upload/files \ No newline at end of file diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index b93f1ad203b390b6538e3bc539bf3a9ed6d34cbe..a703eadeabf41b0f402e844e75dec406e93e9b6c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -273,27 +273,8 @@ services: container_name: dbrepo-ui hostname: ui image: docker.io/dbrepo/ui:latest - environment: - BROKER_USERNAME: "${BROKER_USERNAME:-fda}" - BROKER_PASSWORD: "${BROKER_PASSWORD:-fda}" - BROKER_LOGIN_URL: "${BROKER_LOGIN_URL:-/admin/broker/}" - KEYCLOAK_LOGIN_URL: "${KEYCLOAK_LOGIN_URL:-/api/auth/admin/}" - OPENSEARCH_LOGIN_URL: "${OPENSEARCH_LOGIN_URL:-/admin/dashboard/}" - SHARED_FILESYSTEM: "${SHARED_FILESYSTEM:-/tmp}" - LOGO: "${LOGO:-/logo.png}" - SEARCH_USERNAME: "${SEARCH_USERNAME:-admin}" - SEARCH_PASSWORD: "${SEARCH_PASSWORD:-admin}" - VERSION: "${VERSION:-latest}" - TITLE: "${TITLE:-Database Repository}" - ICON: "${ICON:-/favicon.ico}" - DBREPO_CLIENT_ID: "${DBREPO_CLIENT_ID:-dbrepo-client}" - DBREPO_CLIENT_SECRET: "${DBREPO_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}" - S3_STORAGE_HOSTNAME: "${STORAGE_HOSTNAME:-storage-service}" - S3_STORAGE_PORT: "${STORAGE_PORT:-9000}" - S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-minioadmin}" - S3_SECRET_ACCESS_KEY: ${STORAGE_PASSWORD:-minioadmin} - FORCE_SSL: "${FORCE_SSL:-false}" - DOI_URL: "${DOI_URL:-https://doi.org}" + volumes: + - ./dist/dbrepo.config.json:/app/dbrepo.config.json depends_on: dbrepo-search-service: condition: service_started diff --git a/docker-compose.yml b/docker-compose.yml index aa8b60173e16a0e897cd8330fe8d2ea5ccefbc4b..f38cb5618f150c5e5e1c439efef7e20aff3c8045 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -281,8 +281,6 @@ services: hostname: ui image: dbrepo-ui:latest build: ./dbrepo-ui - volumes: - - ./dbrepo.config.json:/app/dbrepo.config.json depends_on: dbrepo-search-service: condition: service_started diff --git a/install.sh b/install.sh index 390f09dc43d50d0f185be23580a5eaa06137517b..0a2941913fc5772aad5d79ee48448ba9c30fe408 100644 --- a/install.sh +++ b/install.sh @@ -22,6 +22,7 @@ curl -sSL -o ./dist/pubkey.pem https://gitlab.phaidra.org/fair-data-austria-db-r curl -sSL -o ./dist/definitions.json https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-broker-service/definitions.json curl -sSL -o ./dist/dbrepo.conf https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-gateway-service/dbrepo.conf curl -sSL -o ./dist/opensearch_dashboards.yml https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-search-db/opensearch_dashboards.yml +curl -sSL -o ./dist/dbrepo.config.json https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-ui/dbrepo.config.json echo "[📦] Pulling images ..." docker compose pull