diff --git a/.docs/.openapi/api.base.yaml b/.docs/.openapi/api.base.yaml index 240f63f7cb7d4ec21363dee8c37bb5c360e22278..ec62afe97aecd1bec6123351f40076ee7591881b 100644 --- a/.docs/.openapi/api.base.yaml +++ b/.docs/.openapi/api.base.yaml @@ -24,7 +24,7 @@ info: name: Apache 2.0 url: https://www.apache.org/licenses/LICENSE-2.0 title: DBRepo REST API - version: 1.9.0 + version: 1.9.1 openapi: 3.1.0 servers: - description: Test Instance diff --git a/.docs/api/analyse-service.md b/.docs/api/analyse-service.md index c487af938fff53ed9839c1cc147ac9d1bb596e9e..db44f66efda6557a1bbbc84e3b5448646a7368e4 100644 --- a/.docs/api/analyse-service.md +++ b/.docs/api/analyse-service.md @@ -6,7 +6,7 @@ author: Martin Weise !!! debug "Debug Information" - Image: [`registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.0`](https://hub.docker.com/r/dbrepo/analyse-service) + Image: [`registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.1`](https://hub.docker.com/r/dbrepo/analyse-service) * Ports: 5000/tcp * Prometheus: `http://<hostname>:5000/metrics` diff --git a/.docs/api/data-service.md b/.docs/api/data-service.md index 8ea7bf2a97afea8f7a7caf913b02f04cea762c17..4f7a1a30ec80a8e77c403f04aaabb54ee52c8f97 100644 --- a/.docs/api/data-service.md +++ b/.docs/api/data-service.md @@ -6,7 +6,7 @@ author: Martin Weise !!! debug "Debug Information" - Image: [`registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.0`](https://hub.docker.com/r/dbrepo/data-service) + Image: [`registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.1`](https://hub.docker.com/r/dbrepo/data-service) * Ports: 9093/tcp * Info: `http://<hostname>:9093/actuator/info` diff --git a/.docs/api/metadata-service.md b/.docs/api/metadata-service.md index b4066332a944bd07996ccb123f1bb51a32455493..af1ecb4a681cd31b5a2208c3bf4975072e52e231 100644 --- a/.docs/api/metadata-service.md +++ b/.docs/api/metadata-service.md @@ -6,7 +6,7 @@ author: Martin Weise !!! debug "Debug Information" - Image: [`registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.0`](https://hub.docker.com/r/dbrepo/metadata-service) + Image: [`registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.1`](https://hub.docker.com/r/dbrepo/metadata-service) * Ports: 9099/tcp * Info: `http://<hostname>:9099/actuator/info` diff --git a/.docs/api/search-service.md b/.docs/api/search-service.md index 6797e5d2225b5ba9755ebf7176204b3e9cac4cdf..25f08adec993d5c1ba1f74c0ac9c25a493a0816d 100644 --- a/.docs/api/search-service.md +++ b/.docs/api/search-service.md @@ -6,7 +6,7 @@ author: Martin Weise !!! debug "Debug Information" - Image: [`registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.0`](https://hub.docker.com/r/dbrepo/search-service) + Image: [`registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.1`](https://hub.docker.com/r/dbrepo/search-service) * Ports: 4000/tcp * Health: `http://<hostname>:4000/api/search/health` diff --git a/.docs/api/ui.md b/.docs/api/ui.md index 5bd5688bc752cface92bf41b3b33b1253810e7aa..2f46559e2c165de333b1dcc5d5b92ea86f1043c2 100644 --- a/.docs/api/ui.md +++ b/.docs/api/ui.md @@ -6,7 +6,7 @@ author: Martin Weise !!! debug "Debug Information" - Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.0`](https://hub.docker.com/r/dbrepo/ui) + Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.1`](https://hub.docker.com/r/dbrepo/ui) * Ports: 3000/tcp diff --git a/.docs/changelog.md b/.docs/changelog.md index 723b48b8f18da1b1bca79ecf04a832d1435a925e..df198bb9d14efdc8a7508839174b992252faf50b 100644 --- a/.docs/changelog.md +++ b/.docs/changelog.md @@ -7,7 +7,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [v1.9.1](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.9.1) - 2025-05-31 + +#### Changes + +* Release a new patch since version 1.9.0 was accidentally released on PyPI. + +## [v1.9.0](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.9.0) - 2025-05-30 #### Fixes diff --git a/.docs/index.md b/.docs/index.md index 5782826a24bb9a430096d635e69597aab050b430..833e5db5f7154175294b1f403cc36780c0a61b3c 100644 --- a/.docs/index.md +++ b/.docs/index.md @@ -14,7 +14,7 @@ author: Martin Weise   -Documentation for version: [v1.9.0](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases). +Documentation for version: [v1.9.1](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases). DBRepo is an open-source database repository that cover the data life cycle supporting data evolution, -citation and -versioning. It implements the query store of the [RDA WGDC](https://doi.org/10.1162/99608f92.be565013) on diff --git a/.docs/installation.md b/.docs/installation.md index 79530f31ee8ee69ffdab2c0078921948229a6db2..785a96794f3775c478bb3e6aec88170f7a573011 100644 --- a/.docs/installation.md +++ b/.docs/installation.md @@ -11,7 +11,7 @@ author: Martin Weise If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with: ```shell -curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.8/install.sh | bash +curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.9/install.sh | bash ``` !!! bug "Default installation security disclaimer" @@ -35,7 +35,7 @@ SSL/TLS certificate is recommended. Follow the [secure installation](#secure-ins Execute the installation script to download only the environment and save it to `dist`. ```shell -curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.8/install.sh | DOWNLOAD_ONLY=1 bash +curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.9/install.sh | DOWNLOAD_ONLY=1 bash ``` ### Static Configuration @@ -79,7 +79,7 @@ the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`. Update the client secret of the `dbrepo-client`: ```bash -curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.8/.scripts/reg-client-secret.sh" | bash +curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.9/.scripts/reg-client-secret.sh" | bash ``` Also, update the JWT key according to the diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md index 0712b72ec8a45fa4b44a369c39753bda2bc00b3b..3fb005e58046f287840dcd2436da81dd397bbe81 100644 --- a/.docs/kubernetes.md +++ b/.docs/kubernetes.md @@ -14,7 +14,7 @@ helm upgrade --install dbrepo \ -n dbrepo \ "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \ --values ./values.yaml \ - --version "1.9.0" \ + --version "1.9.1" \ --create-namespace \ --cleanup-on-fail ``` diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96608d21385099c2b839b10b2e7133050171a097..c3a44109fa41b9ef5bc75363635307d48ab7557e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,9 @@ variables: REGCLIENT_VERSION: "0.8.2" BUN_VERSION: "1.1.40" DOC_VERSION: "1.9" - APP_VERSION: "1.9.0" - CHART_VERSION: "1.9.0" - SUPPORTED_VERSIONS: "1.8.0, 1.8.1, 1.8.2, 1.9.0" + APP_VERSION: "1.9.1" + CHART_VERSION: "1.9.1" + SUPPORTED_VERSIONS: "1.8.0, 1.8.1, 1.8.2, 1.9.0, 1.9.1" SUPPORTED_ARCH: "linux/amd64" MAINTAINED_SERVICES: "analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-service, search-service-init, storage-service-init, ui" CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}" @@ -560,7 +560,6 @@ release-images: - test-ui only: - tags - - dev before_script: - "apk add --no-cache make maven openjdk17-jdk" - "docker logout ${CI_REGISTRY_URL}" @@ -586,8 +585,8 @@ release-helm: - "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}" - "docker logout ${CI_REGISTRY2_URL}" - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}" - - echo "$CI_GPG_KEYRING" | base64 -d > ~/secring.gpg - - echo "$CI_GPG_KEYRING2" | base64 -d > ~/pubring.gpg + - echo "$CI_GPG_SECRING" | base64 -d > ~/secring.gpg + - echo "$CI_GPG_PUBRING" | base64 -d > ~/pubring.gpg - helm registry login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY_URL}" - helm registry login --username "${CI_REGISTRY2_USER}" --password "${CI_REGISTRY2_PASSWORD}" "${CI_REGISTRY2_URL}" - make build-helm @@ -601,7 +600,8 @@ release-docs: stage: release image: docker.io/python:${PYTHON_VERSION}-alpine${ALPINE_VERSION} only: - - tags + refs: + - /^release-.*/ before_script: - "apk add --no-cache alpine-sdk bash sed wget openssh jq curl" - "pip install pipenv" diff --git a/.gitlab/gen-badge.sh b/.gitlab/gen-badge.sh index 4124b388d74d91017cba3aff2dc4942233d06d42..625ad19c02b72a4ba28051213867cce6abbcb1b3 100644 --- a/.gitlab/gen-badge.sh +++ b/.gitlab/gen-badge.sh @@ -1,15 +1,24 @@ #!/bin/bash anybadge --label pipeline --value "passed" failed=red passed=green canceled=darkgray > "./final/${DOC_VERSION}/images/pipeline.svg" -PIPELINE_COVERAGE=$(curl -fsSL -H "PRIVATE-TOKEN: ${CI_TOKEN}" "${GITLAB_URL}/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines/latest?ref=${CI_COMMIT_BRANCH}" | jq --raw-output .coverage) +URL="${GITLAB_URL}/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines/latest?ref=${CI_COMMIT_BRANCH}" +echo "[DEBUG] obtaining pipeline coverage from url: $URL ..." +PIPELINE_COVERAGE=$(curl -fsSL -H "PRIVATE-TOKEN: ${CI_TOKEN}" $URL | jq --raw-output .coverage) echo "[INFO] pipeline coverage: ${PIPELINE_COVERAGE}" + if [ "${PIPELINE_COVERAGE}" != "null" ]; then anybadge --label coverage --value "${PIPELINE_COVERAGE}" coverage > "./final/${DOC_VERSION}/images/coverage.svg" else echo "[WARNING] Skipping badge generation, displaying default badge text: unknown" fi -curl -fsSL "${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=sqale_rating&token=${CI_SONAR_BADGE_TOKEN}" > "./final/${DOC_VERSION}/images/maintainability.svg" -curl -fsSL "${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=security_rating&token=${CI_SONAR_BADGE_TOKEN}" > "./final/${DOC_VERSION}/images/security.svg" + +URL="${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=sqale_rating&token=${CI_SONAR_BADGE_TOKEN}" +echo "[DEBUG] obtain maintainability project badge from url: $URL ..." +curl -fsSL $URL > "./final/${DOC_VERSION}/images/maintainability.svg" + +URL="${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=security_rating&token=${CI_SONAR_BADGE_TOKEN}" +echo "[DEBUG] obtain security project badge from url: $URL ..." +curl -fsSL $URL > "./final/${DOC_VERSION}/images/security.svg" echo "[INFO] retrieved badges" \ No newline at end of file diff --git a/Makefile b/Makefile index 738831a4cfb224d2b584d2e82d646579129698ad..e13bb9ce88ef7c638bfb69a318c03cf3d8864fe1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all -APP_VERSION ?= 1.9.0 -CHART_VERSION ?= 1.9.0 +APP_VERSION ?= 1.9.1 +CHART_VERSION ?= 1.9.1 REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo .PHONY: all diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile index bf5a2677d6cb206e6d010c10cc084cc0b0d280fd..6ea296ccf99e239de5b6e65f140044176b839489 100644 --- a/dbrepo-analyse-service/Pipfile +++ b/dbrepo-analyse-service/Pipfile @@ -21,7 +21,7 @@ numpy = "*" pandas = "*" minio = "*" pydantic = "*" -dbrepo = {path = "./lib/dbrepo-1.9.0.tar.gz"} +dbrepo = {path = "./lib/dbrepo-1.9.1.tar.gz"} opensearch-py = "*" ecs_logging = "*" diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock index bc9a2cbeb3d608ec8e111a1d3bc937dc7667942a..7d7a367358c6455c3a35bd2b382adc1bb6101358 100644 --- a/dbrepo-analyse-service/Pipfile.lock +++ b/dbrepo-analyse-service/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "bb1e86635cba8bfa5ad0a45abade8841ba91778d2ff0bcac1f455e8f17838baa" + "sha256": "683dd8c657d5355de5fbe9fb26daa0807a4b6a5d66f8293468a7bbca16ffa88c" }, "pipfile-spec": 6, "requires": { @@ -77,19 +77,19 @@ }, "boto3": { "hashes": [ - "sha256:1f95ec3ac88ae6381fa0409e4c2ad0a41f0caf5fd6d8ef45a9525406a3f58b18", - "sha256:abdb8c760543e9c22026320e62e2934762b0c4ac4f42e8ea2a756f2d489b3135" + "sha256:94bd7fdd92d5701b362d4df100d21e28f8307a67ff56b6a8b0398119cf22f859", + "sha256:95f5fe688795303a8a15e8b7e7f255cadab35eae459d00cc281a4fd77252ea80" ], "index": "pypi", - "version": "==1.38.24" + "version": "==1.38.27" }, "botocore": { "hashes": [ - "sha256:43563d5c2dfd56ebbcd9e25f482fc45000bfaec5966b26c77b331bd340c46376", - "sha256:5901667b96d3a8603479879ab097560216cdc4c2918d433fc6509555d0ada29c" + "sha256:9788f7efe974328a38cbade64cc0b1e67d27944b899f88cb786ae362973133b6", + "sha256:a785d5e9a5eda88ad6ab9ed8b87d1f2ac409d0226bba6ff801c55359e94d91a8" ], "markers": "python_version >= '3.9'", - "version": "==1.38.24" + "version": "==1.38.27" }, "certifi": { "hashes": [ @@ -323,11 +323,10 @@ }, "dbrepo": { "hashes": [ - "sha256:76f0ab97d1e914a779aa51b5e5a17591b2f1c88f15dc9df27273deb4dc7ed125", - "sha256:f01ee3102dc405c00b5e61cd1d62a46f9644ca33d131912cc25130a5ec304378" + "sha256:32a72a27077bcaefafed362feae8c025348ed222b438e0dfe855779aed686584" ], - "path": "./lib/dbrepo-1.9.0.tar.gz", - "version": "==1.9.0" + "path": "./lib/dbrepo-1.9.1.tar.gz", + "version": "==1.9.1" }, "ecs-logging": { "hashes": [ diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py index 8508ba1367b456846fe78483ddbf8d081f9d57a1..2dfd301e720859c15e18d8f0aac7bcafcf55a7ac 100644 --- a/dbrepo-analyse-service/app.py +++ b/dbrepo-analyse-service/app.py @@ -199,7 +199,7 @@ template = { "info": { "title": "Database Repository Analyse Service API", "description": "Service that analyses data structures", - "version": "1.9.0", + "version": "1.9.1", "contact": { "name": "Prof. Andreas Rauber", "email": "andreas.rauber@tuwien.ac.at" diff --git a/dbrepo-analyse-service/lib/dbrepo-1.9.0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.9.0.tar.gz deleted file mode 100644 index 247061da5eb4abb58ba6b1d2a41276b9eccafc4b..0000000000000000000000000000000000000000 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.9.0.tar.gz and /dev/null differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.9.0-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.9.1-py3-none-any.whl similarity index 85% rename from dbrepo-analyse-service/lib/dbrepo-1.9.0-py3-none-any.whl rename to dbrepo-analyse-service/lib/dbrepo-1.9.1-py3-none-any.whl index b5cf628e6f4fcff5db3f2ad4fbaaf85d221087fd..3d97921b6a82ef23d9c32a22c8db6d74a09b400a 100644 Binary files a/dbrepo-analyse-service/lib/dbrepo-1.9.0-py3-none-any.whl and b/dbrepo-analyse-service/lib/dbrepo-1.9.1-py3-none-any.whl differ diff --git a/dbrepo-analyse-service/lib/dbrepo-1.9.1.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.9.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8aca96aacad8cc90c6a0d978c49b4bc0bdeb032d Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.9.1.tar.gz differ diff --git a/dbrepo-auth-service/init/Pipfile b/dbrepo-auth-service/init/Pipfile index 8686321ac48e25128dc5463206c71aa8a4bf0045..85449bc7e2bb8e9a7d230136aa7ef8c3f7e41ccf 100644 --- a/dbrepo-auth-service/init/Pipfile +++ b/dbrepo-auth-service/init/Pipfile @@ -7,7 +7,7 @@ name = "pypi" requests = "*" mariadb = "*" ecs_logging = "*" -dbrepo = {path = "./lib/dbrepo-1.9.0.tar.gz"} +dbrepo = {path = "./lib/dbrepo-1.9.1.tar.gz"} [dev-packages] coverage = "*" diff --git a/dbrepo-auth-service/init/Pipfile.lock b/dbrepo-auth-service/init/Pipfile.lock index 8f210a2344069b8a644069ea7600621371784bf3..b5f520be9b2bd0324926955b66bf9456780283c9 100644 --- a/dbrepo-auth-service/init/Pipfile.lock +++ b/dbrepo-auth-service/init/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "2130479fdb1816b229b92799ef1b307b5d2612087f551b08ac3f13ed173907a5" + "sha256": "abe8b909c2f90002157de747a21ae3607758fc775e59de0657b7c33d945e752a" }, "pipfile-spec": 6, "requires": { @@ -132,10 +132,10 @@ }, "dbrepo": { "hashes": [ - "sha256:9e1571c5d1dff922584d264f1708ed10774029c97d164ec28e853e1343dd6f3b" + "sha256:6cde515183d5f4644ebbc26f06155a474b42ab2a4699f03dfe77fc28688b45a1" ], - "path": "./lib/dbrepo-1.9.0.tar.gz", - "version": "==1.9.0" + "path": "./lib/dbrepo-1.9.1.tar.gz", + "version": "==1.9.1" }, "ecs-logging": { "hashes": [ diff --git a/dbrepo-auth-service/init/lib/dbrepo-1.9.0.tar.gz b/dbrepo-auth-service/init/lib/dbrepo-1.9.0.tar.gz deleted file mode 100644 index b24c628496a5d2753bebe080118cba5237390e28..0000000000000000000000000000000000000000 Binary files a/dbrepo-auth-service/init/lib/dbrepo-1.9.0.tar.gz and /dev/null differ diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.9.0-py3-none-any.whl b/dbrepo-auth-service/init/lib/dbrepo-1.9.1-py3-none-any.whl similarity index 85% rename from dbrepo-dashboard-service/lib/dbrepo-1.9.0-py3-none-any.whl rename to dbrepo-auth-service/init/lib/dbrepo-1.9.1-py3-none-any.whl index b5cf628e6f4fcff5db3f2ad4fbaaf85d221087fd..3d97921b6a82ef23d9c32a22c8db6d74a09b400a 100644 Binary files a/dbrepo-dashboard-service/lib/dbrepo-1.9.0-py3-none-any.whl and b/dbrepo-auth-service/init/lib/dbrepo-1.9.1-py3-none-any.whl differ diff --git a/dbrepo-auth-service/init/lib/dbrepo-1.9.1.tar.gz b/dbrepo-auth-service/init/lib/dbrepo-1.9.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8aca96aacad8cc90c6a0d978c49b4bc0bdeb032d Binary files /dev/null and b/dbrepo-auth-service/init/lib/dbrepo-1.9.1.tar.gz differ diff --git a/dbrepo-auth-service/listeners/create-event-listener.jar b/dbrepo-auth-service/listeners/create-event-listener.jar index 58ae18d12de1331078787969009290c78ef64c3b..8df9e19da6675b86f1b5755a9cec8c8e1044b11f 100644 Binary files a/dbrepo-auth-service/listeners/create-event-listener.jar and b/dbrepo-auth-service/listeners/create-event-listener.jar differ diff --git a/dbrepo-dashboard-service/Pipfile b/dbrepo-dashboard-service/Pipfile index 16c8e368dbe6d91aa758c446cf0d7b0bbd0765de..ee805c077b60ab4a8a6f348ff819da0b568c0614 100644 --- a/dbrepo-dashboard-service/Pipfile +++ b/dbrepo-dashboard-service/Pipfile @@ -12,7 +12,7 @@ prometheus-flask-exporter = "*" python-dotenv = "~=1.0" jwt = "~=1.3" pytest = "*" -dbrepo = {path = "./lib/dbrepo-1.9.0.tar.gz"} +dbrepo = {path = "./lib/dbrepo-1.9.1.tar.gz"} gunicorn = "*" pydantic = "*" flask_httpauth = "*" diff --git a/dbrepo-dashboard-service/Pipfile.lock b/dbrepo-dashboard-service/Pipfile.lock index c6c60b0ee90fa824dbb708bf20313324ce674e68..3a969a61b14fdd52c18acaf14d9e5fce80ce08e3 100644 --- a/dbrepo-dashboard-service/Pipfile.lock +++ b/dbrepo-dashboard-service/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "3b53fdc68c4705c6d377819efb99c8c60517b7d75ae1a40b3f9be1240d175dc0" + "sha256": "4addd51108f7ad13a3a58c75b68a40dbfe8fa1ce02622f00741cea9c3c3a3ae7" }, "pipfile-spec": 6, "requires": { @@ -272,11 +272,10 @@ }, "dbrepo": { "hashes": [ - "sha256:76f0ab97d1e914a779aa51b5e5a17591b2f1c88f15dc9df27273deb4dc7ed125", - "sha256:f01ee3102dc405c00b5e61cd1d62a46f9644ca33d131912cc25130a5ec304378" + "sha256:b6d7b9f5efeade2274249f1e48517820dd58dce5b24c0bf092cb4fc4be59c602" ], - "path": "./lib/dbrepo-1.9.0.tar.gz", - "version": "==1.9.0" + "path": "./lib/dbrepo-1.9.1.tar.gz", + "version": "==1.9.1" }, "ecs-logging": { "hashes": [ diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.9.0.tar.gz b/dbrepo-dashboard-service/lib/dbrepo-1.9.0.tar.gz deleted file mode 100644 index 247061da5eb4abb58ba6b1d2a41276b9eccafc4b..0000000000000000000000000000000000000000 Binary files a/dbrepo-dashboard-service/lib/dbrepo-1.9.0.tar.gz and /dev/null differ diff --git a/dbrepo-search-service/lib/dbrepo-1.9.0-py3-none-any.whl b/dbrepo-dashboard-service/lib/dbrepo-1.9.1-py3-none-any.whl similarity index 85% rename from dbrepo-search-service/lib/dbrepo-1.9.0-py3-none-any.whl rename to dbrepo-dashboard-service/lib/dbrepo-1.9.1-py3-none-any.whl index b5cf628e6f4fcff5db3f2ad4fbaaf85d221087fd..3d97921b6a82ef23d9c32a22c8db6d74a09b400a 100644 Binary files a/dbrepo-search-service/lib/dbrepo-1.9.0-py3-none-any.whl and b/dbrepo-dashboard-service/lib/dbrepo-1.9.1-py3-none-any.whl differ diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.9.1.tar.gz b/dbrepo-dashboard-service/lib/dbrepo-1.9.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8aca96aacad8cc90c6a0d978c49b4bc0bdeb032d Binary files /dev/null and b/dbrepo-dashboard-service/lib/dbrepo-1.9.1.tar.gz differ diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml index 566fe3728d38f051599719470f37d7ad531edeaf..f806ccb7794c5c0f5a551289b82284ecf0a321a7 100644 --- a/dbrepo-data-service/pom.xml +++ b/dbrepo-data-service/pom.xml @@ -16,7 +16,7 @@ <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>data-service</artifactId> <name>data-service</name> - <version>1.9.0</version> + <version>1.9.1</version> <description>Service that manages the data</description> @@ -96,7 +96,7 @@ <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>dbrepo-core</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> <!-- Spark --> <dependency> diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml index 8b7d0812711ce5f16b1f7f9b942fcb8f3b0ee002..ddde97c4dc5165f29dcd2abf89f50dfa207610f1 100644 --- a/dbrepo-data-service/querystore/pom.xml +++ b/dbrepo-data-service/querystore/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>data-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>querystore</name> <artifactId>querystore</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies/> diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml index 409ffcc5622e175daedb1b12d816659fe87344f0..a17e5adecaf5eb8f4748f724aca42bc41e52e84f 100644 --- a/dbrepo-data-service/report/pom.xml +++ b/dbrepo-data-service/report/pom.xml @@ -6,23 +6,23 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>data-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>report</name> <artifactId>report</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>rest-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>services</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> </dependencies> diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml index 8965b3d36dbbe9c3a4c5c5aa2f3696192515d8bf..49d83a28c00b5dab842052386a959de0106e9c0b 100644 --- a/dbrepo-data-service/rest-service/pom.xml +++ b/dbrepo-data-service/rest-service/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>data-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>rest-service</name> <artifactId>rest-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>services</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> </dependencies> diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml index 3388d031acae457da0a0d434112f4baf6afb8da3..2513a620242be7085e0a4f006bbf1423a79582c0 100644 --- a/dbrepo-data-service/services/pom.xml +++ b/dbrepo-data-service/services/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>data-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>services</name> <artifactId>services</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>querystore</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> </dependencies> diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml index b2f58fb5f516721f2625d857e510d9a9938e9d7b..672f9b98a177acc992d6cd1203ad271e36432134 100644 --- a/dbrepo-metadata-service/oai/pom.xml +++ b/dbrepo-metadata-service/oai/pom.xml @@ -6,12 +6,12 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>metadata-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>oai</name> <artifactId>oai</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies/> diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml index d7adb9dfae03884e59ead564f6f78dd82bfdd145..428062e680058ab80e67c056e14117139ea1cd32 100644 --- a/dbrepo-metadata-service/pom.xml +++ b/dbrepo-metadata-service/pom.xml @@ -18,7 +18,7 @@ <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>metadata-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <packaging>pom</packaging> <modules> @@ -69,7 +69,7 @@ <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>dbrepo-core</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> <!-- Data Source --> <dependency> diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml index 84ac2939e101b9f0320a7de44e1dc4c8bbc1e544..1f418831b88914169c843fee84a6131ab52043c8 100644 --- a/dbrepo-metadata-service/report/pom.xml +++ b/dbrepo-metadata-service/report/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>metadata-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>report</name> <artifactId>report</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>services</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> </dependencies> diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml index 6d568fee19a1ac50527e9c8e6db005dd33b29b56..c7135144b847c5574a6f303b669c74952cc64b66 100644 --- a/dbrepo-metadata-service/repositories/pom.xml +++ b/dbrepo-metadata-service/repositories/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>metadata-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>repositories</name> <artifactId>repositories</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>oai</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> </dependencies> diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml index 8b87ec8a0338deaf8ba5960bb9c2f87ed464916b..087e22b654a7ef118053dfdb9f1e451b8ba554bb 100644 --- a/dbrepo-metadata-service/rest-service/pom.xml +++ b/dbrepo-metadata-service/rest-service/pom.xml @@ -6,18 +6,18 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>metadata-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>rest-service</name> <artifactId>rest-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>services</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> </dependencies> diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml index b1453e12a6f90c225858bfa917f486e9a9367fd3..6b5f58f4f6797012f6e1e3e621a7c8700f3234e5 100644 --- a/dbrepo-metadata-service/services/pom.xml +++ b/dbrepo-metadata-service/services/pom.xml @@ -6,23 +6,23 @@ <parent> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>metadata-service</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </parent> <name>services</name> <artifactId>services</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> <dependencies> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>oai</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> <dependency> <groupId>at.ac.tuwien.ifs.dbrepo</groupId> <artifactId>repositories</artifactId> - <version>1.9.0</version> + <version>1.9.1</version> </dependency> </dependencies> diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile index f9d3a2c2ffef404da57c5068227c3b85b6c20bfd..e62574783c7e347bcbd40fcebb4ff2fe0a498e7c 100644 --- a/dbrepo-search-service/Pipfile +++ b/dbrepo-search-service/Pipfile @@ -17,7 +17,7 @@ flask_httpauth = "*" jwt = "~=1.3" rdflib = "*" grafana-client = "*" -dbrepo = {path = "./lib/dbrepo-1.9.0.tar.gz"} +dbrepo = {path = "./lib/dbrepo-1.9.1.tar.gz"} gunicorn = "*" ecs_logging = "*" diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock index c0d9f88ddd59a9a7feac41599f5f4a3d8384f7d9..6c32cb119d2b4dc4945c5fdfcc901a422cbff162 100644 --- a/dbrepo-search-service/Pipfile.lock +++ b/dbrepo-search-service/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "56c33b1336dadb699cf5c5b2892e926bdad0ac127a68922188b78bb89dec922d" + "sha256": "40d4f3f3e19b2840cae3c53ef9a753b8c93e6601e4b10e03c8f4d7a8276440be" }, "pipfile-spec": 6, "requires": { @@ -272,11 +272,10 @@ }, "dbrepo": { "hashes": [ - "sha256:76f0ab97d1e914a779aa51b5e5a17591b2f1c88f15dc9df27273deb4dc7ed125", - "sha256:f01ee3102dc405c00b5e61cd1d62a46f9644ca33d131912cc25130a5ec304378" + "sha256:b6d7b9f5efeade2274249f1e48517820dd58dce5b24c0bf092cb4fc4be59c602" ], - "path": "./lib/dbrepo-1.9.0.tar.gz", - "version": "==1.9.0" + "path": "./lib/dbrepo-1.9.1.tar.gz", + "version": "==1.9.1" }, "ecs-logging": { "hashes": [ diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py index 127d101430accece19f21a637105b2fa3a75c0c7..37885f81dc11d07aecb3c9dddf2d650f58023182 100644 --- a/dbrepo-search-service/app.py +++ b/dbrepo-search-service/app.py @@ -183,7 +183,7 @@ template = { "info": { "title": "Database Repository Search Service API", "description": "Service that searches the search database", - "version": "1.9.0", + "version": "1.9.1", "contact": { "name": "Prof. Andreas Rauber", "email": "andreas.rauber@tuwien.ac.at" diff --git a/dbrepo-search-service/lib/dbrepo-1.9.0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.9.0.tar.gz deleted file mode 100644 index 247061da5eb4abb58ba6b1d2a41276b9eccafc4b..0000000000000000000000000000000000000000 Binary files a/dbrepo-search-service/lib/dbrepo-1.9.0.tar.gz and /dev/null differ diff --git a/dbrepo-auth-service/init/lib/dbrepo-1.9.0-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.9.1-py3-none-any.whl similarity index 83% rename from dbrepo-auth-service/init/lib/dbrepo-1.9.0-py3-none-any.whl rename to dbrepo-search-service/lib/dbrepo-1.9.1-py3-none-any.whl index 23950d61fc98e36a15c4a8ed9c452e86446b589b..3d97921b6a82ef23d9c32a22c8db6d74a09b400a 100644 Binary files a/dbrepo-auth-service/init/lib/dbrepo-1.9.0-py3-none-any.whl and b/dbrepo-search-service/lib/dbrepo-1.9.1-py3-none-any.whl differ diff --git a/dbrepo-search-service/lib/dbrepo-1.9.1.tar.gz b/dbrepo-search-service/lib/dbrepo-1.9.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8aca96aacad8cc90c6a0d978c49b4bc0bdeb032d Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.9.1.tar.gz differ diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml index da537a39bb6ebd4ad8698ec44cd1d9a4c85f418f..aa0cb20243da56c83e7943154f769bef0b0114b5 100644 --- a/helm/dbrepo/Chart.yaml +++ b/helm/dbrepo/Chart.yaml @@ -7,8 +7,8 @@ description: Helm Chart for installing DBRepo sources: - https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services type: application -version: "1.9.0" -appVersion: "1.9.0" +version: "1.9.1" +appVersion: "1.9.1" keywords: - dbrepo maintainers: diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md index 4f5c56f0d51521eab427152fed25f3860807ec0b..627ab8627f800c2bd75a809e51d857c570646132 100644 --- a/helm/dbrepo/README.md +++ b/helm/dbrepo/README.md @@ -11,7 +11,7 @@ sample [ for your deployment and update the variables, especially `hostname`. ```bash -helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.9.0" +helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.9.1" ``` ## Prerequisites @@ -34,7 +34,7 @@ variable when you increase the available Pod memory for performance. To install the chart with the release name `my-release`: ```bash -helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.9.0" +helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.9.1" ``` The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the diff --git a/helm/dbrepo/charts/seaweedfs-4.8.7.tgz b/helm/dbrepo/charts/seaweedfs-4.8.7.tgz index d66de2af15ba6ad18f5545f7565f1b8cc7e5bf77..c5d992f3d188e603612b37cf3afac2efa935571b 100644 Binary files a/helm/dbrepo/charts/seaweedfs-4.8.7.tgz and b/helm/dbrepo/charts/seaweedfs-4.8.7.tgz differ diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index 58ae18d12de1331078787969009290c78ef64c3b..8df9e19da6675b86f1b5755a9cec8c8e1044b11f 100644 Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml index 4a4ffc1e601b9cd4c157d3a4a082b8d588a20c32..b15f67ee63dbeba62fbdd0024775ea57f1de8985 100644 --- a/helm/dbrepo/values.yaml +++ b/helm/dbrepo/values.yaml @@ -141,7 +141,7 @@ authservice: setupJob: image: ## @skip authservice.setupJob.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.9.1 ## @param authservice.setupJob.resourcesPreset The container resource preset resourcesPreset: "nano" ## @param authservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads) @@ -419,7 +419,7 @@ analyseservice: enabled: true image: ## @skip analyseservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.1 ## @param analyseservice.podAnnotations the pod annotations. Evaluated as a template ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ podAnnotations: { } @@ -483,7 +483,7 @@ metadataservice: enabled: true image: ## @skip metadataservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.1 ## @param metadataservice.podAnnotations the pod annotations. Evaluated as a template ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ podAnnotations: { } @@ -583,7 +583,7 @@ dataservice: endpoint: http://data-service image: ## @skip dataservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.1 ## @param dataservice.podAnnotations the pod annotations. Evaluated as a template ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ podAnnotations: { } @@ -672,7 +672,7 @@ searchservice: endpoint: http://search-service image: ## @skip searchservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.1 ## @param searchservice.podAnnotations the pod annotations. Evaluated as a template ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ podAnnotations: { } @@ -724,7 +724,7 @@ searchservice: enabled: true image: ## @skip searchservice.setupJob.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.9.1 ## @param searchservice.setupJob.resourcesPreset The container resource preset resourcesPreset: "nano" ## @param searchservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads) @@ -787,7 +787,7 @@ storageservice: enabled: true image: ## @skip storageservice.setupJob.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.9.1 s3: ## @param storageservice.setupJob.s3.endpoint The S3-capable endpoint the microservice connects to. endpoint: http://storage-service-s3:8333 @@ -922,7 +922,7 @@ ui: enabled: true image: ## @skip ui.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.1 ## https://stackblitz.com/edit/nuxt-oidc-auth-keygen?file=index.js oidc: ## @param ui.oidc.authSessionSecret This should be a at least 48 characters random string. It is used to encrypt the user session. @@ -1043,7 +1043,7 @@ dashboardservice: enabled: true image: ## @skip dashboardservice.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.9.1 ## @param dashboardservice.endpoint The endpoint for the microservices. endpoint: http://dashboard-service ## @param dashboardservice.podAnnotations the pod annotations. Evaluated as a template @@ -1098,7 +1098,7 @@ dashboardservice: enabled: true image: ## @skip dashboardservice.setupJob.image.name - name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:1.9.0 + name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:1.9.1 ## @param dashboardservice.setupJob.resourcesPreset The container resource preset resourcesPreset: "nano" ## @param dashboardservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads) diff --git a/install.sh b/install.sh index 66c27fbfc732f75ad068de83eec340fd471f4cd0..6110ab5276d1efa5ff29eb7cc09abd39d63ec9a9 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,7 @@ #!/bin/bash # preset +APP_VERSION="1.9.1" MIN_CPU=8 MIN_RAM=10 SKIP_CHECKS=${SKIP_CHECKS:-0} diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml index 50ee92410fbf74ed73f9a298c30c649023aca3e1..5e12c02fbe220ad77772d66d14f75cdb978844e7 100644 --- a/lib/python/pyproject.toml +++ b/lib/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "dbrepo" -version = "1.9.0" +version = "1.9.1" description = "DBRepo Python Library" keywords = [ "DBRepo", diff --git a/lib/python/setup.py b/lib/python/setup.py index 1c6a1013ba228b0b9dce10bb12eb7dbbf4c7dc9f..0c57a4c3249be99c3edb0d304316cc6334d2bb78 100644 --- a/lib/python/setup.py +++ b/lib/python/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup(name="dbrepo", - version="1.9.0", + version="1.9.1", description="A library for communicating with DBRepo", url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9/", author="Martin Weise", diff --git a/make/build.mk b/make/build.mk index 78c36e23b17d109215bed545cb2721f1fb009805..2c1efca8568a59963ae2d5e0d3b44e6b33462260 100644 --- a/make/build.mk +++ b/make/build.mk @@ -22,7 +22,7 @@ build-ui: ## Build the UI. .PHONY: build-python-lib build-python-lib: ## Build the Python Library. - rm -rf ./dbrepo-analyse-service/lib/* ./dbrepo-search-service/lib/* ./dbrepo-dashboard-service/lib/* + rm -rf ./dbrepo-analyse-service/lib/* ./dbrepo-search-service/lib/* ./dbrepo-dashboard-service/lib/* ./dbrepo-auth-service/init/lib/* python3 -m build --sdist ./lib/python python3 -m build --wheel ./lib/python cp -r ./lib/python/dist/dbrepo-${APP_VERSION}* ./dbrepo-analyse-service/lib @@ -31,6 +31,8 @@ build-python-lib: ## Build the Python Library. PIPENV_PIPFILE=./dbrepo-search-service/Pipfile pipenv lock cp -r ./lib/python/dist/dbrepo-${APP_VERSION}* ./dbrepo-dashboard-service/lib PIPENV_PIPFILE=./dbrepo-dashboard-service/Pipfile pipenv lock + cp -r ./lib/python/dist/dbrepo-${APP_VERSION}* ./dbrepo-auth-service/init/lib + PIPENV_PIPFILE=./dbrepo-auth-service/init/Pipfile pipenv lock .PHONY: build-helm build-helm: ## Build the DBRepo and DBRepo MariaDB Galera Helm Charts.