diff --git a/.docs/api/metadata-db.md b/.docs/api/metadata-db.md
index f5cc4d84ccefa303bce99af21d3a8116895946ba..4336c7666c012caf5b7f2b8f6979a77d049c9643 100644
--- a/.docs/api/metadata-db.md
+++ b/.docs/api/metadata-db.md
@@ -14,8 +14,8 @@ author: Martin Weise
The metadata database is the single, central source of truth within DBRepo and holds all metadata information for
interaction between the services and displaying information in the UI.
-On the first start, the schema is generated by the file `/docker-entrypoint-initdb.d/setup-schema.sql` within the
-container. You can add custom files that should be executed on the first start by placing them into the
+On the first start, the schema is generated by the file `/docker-entrypoint-initdb.d/setup-schema.sql` within the
+container. You can add custom files that should be executed on the first start by placing them into the
`/docker-entrypoint-initdb.d/` folder as well. For example:
```yaml
@@ -28,6 +28,13 @@ services:
...
```
+## Image
+
+:octicons-tag-16:{ title="Minimum version" } 1.4.4
+
+We recommend to use the MariaDB image directly instead of our own maintained image which just copied
+the `setup-schema.sql` into the container. This can be done more transparently through volume mounts.
+
!!! warning "Alphabetic Filename Sorting"
Beware that the init script provided by Bitnami executes files in alphabetic order! For example: the file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f969aa04ac69a7817a367d0a2daf8817fd200e53..c74b4cabacbf60544fa005acb720440040173fcf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -459,26 +459,6 @@ scan-data-db:
reports:
container_scanning: ./.trivy/trivy-data-db-report.json
-scan-metadata-db:
- image: bitnami/trivy:latest
- stage: scan
- only:
- refs:
- - master
- allow_failure: true
- script:
- - trivy image --insecure --exit-code 0 --format template --template "@.gitlab/gitlab.tpl" -o ./.trivy/trivy-metadata-db-report.json dbrepo-metadata-db:latest
- - trivy image --insecure --exit-code 0 dbrepo-metadata-db:latest
- - trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-metadata-db:latest
- cache:
- paths:
- - .trivycache/
- artifacts:
- when: always
- expire_in: 1 days
- reports:
- container_scanning: ./.trivy/trivy-metadata-db-report.json
-
scan-ui:
image: bitnami/trivy:latest
stage: scan
@@ -606,11 +586,13 @@ release-helm:
- "docker logout ${CI_REGISTRY2_URL}"
- "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
- "apk add sed helm curl"
- - echo "$CI_GPG_KEYRING" | base64 -d > ./secring.gpg
- - helm package ./helm/dbrepo --sign --key 'Martin Weise' --keyring ./secring.gpg --destination ./build
+ - "mkdir -p ~/.gnupg"
+ - echo "$CI_GPG_KEYRING" | base64 -d > ~/.gnupg/secring.gpg
+ - echo "$CI_GPG_KEYRING2" | base64 -d > ~/.gnupg/pubring.gpg
+ - "helm package ./helm/dbrepo --sign --key 'Martin Weise' --keyring ~/.gnupg/secring.gpg --destination ./build"
- "helm plugin install https://github.com/sigstore/helm-sigstore"
script:
- - "helm sigstore upload ./build/dbrepo-${CHART_VERSION}.tgz oci://${CI_REGISTRY2_URL}/helm"
+ - "helm sigstore upload ./build/dbrepo-${CHART_VERSION}.tgz"
release-docs:
stage: release
diff --git a/dbrepo-ui/composables/table-service.ts b/dbrepo-ui/composables/table-service.ts
index 96be0537d07b3990ab638acafc724442ae5f7735..88ab27b39ee93d632d4492ed4a2d2d776cc08e8c 100644
--- a/dbrepo-ui/composables/table-service.ts
+++ b/dbrepo-ui/composables/table-service.ts
@@ -69,7 +69,6 @@ export const useTableService = (): any => {
async function getData(databaseId: number, tableId: number, page: number, size: number, timestamp: Date): Promise<QueryResultDto> {
const axios = useAxiosInstance()
- console.debug('====>', mapFilter(timestamp, page, size))
console.debug('get data for table with id', tableId, 'in database with id', databaseId);
return new Promise<QueryResultDto>((resolve, reject) => {
axios.get<QueryResultDto>(`/api/database/${databaseId}/table/${tableId}/data`, { params: mapFilter(timestamp, page, size), timeout: 30_000 })
diff --git a/dbrepo-ui/utils/index.ts b/dbrepo-ui/utils/index.ts
index 66dbe9448329faab2b2c18b4801bb59d878d06bb..349935c04464af165389a375c76d56139867a9fb 100644
--- a/dbrepo-ui/utils/index.ts
+++ b/dbrepo-ui/utils/index.ts
@@ -1056,10 +1056,12 @@ export function axiosErrorToApiError(error: AxiosError): ApiErrorDto {
code: 'error.axios.timeout',
message: error.message
}
+ console.info('==> mapped axios error to', errorObj)
return errorObj
}
if (error.response?.data) {
const errorObj: ApiErrorDto = (error.response?.data as ApiErrorDto)
+ console.info('==> mapped axios error to', errorObj)
return errorObj
}
const errorObj: ApiErrorDto = {
@@ -1067,6 +1069,7 @@ export function axiosErrorToApiError(error: AxiosError): ApiErrorDto {
code: 'error.axios.connection',
message: error.message
}
+ console.info('==> mapped axios error to', errorObj)
return errorObj
}
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 39d8517cfb4be46707f021274c3dfbdb12c45842..87b471ba14e097c8eada28ab88190b4508ba5c41 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -208,7 +208,7 @@ datadb:
searchdb:
## @param searchdb.enabled Enable the Data Database.
- enabled: true.
+ enabled: true
## @skip searchdb.fullnameOverride
fullnameOverride: search-db
## @skip searchdb.servicenameOverride
diff --git a/make/rel.mk b/make/rel.mk
index c06bb234334f0f55fc0bcf4ab3a6becf04825a63..97aeca4e161ada3786dab0b3ecfca1fc2c3c5a62 100644
--- a/make/rel.mk
+++ b/make/rel.mk
@@ -4,7 +4,6 @@
tag-images: build-images ## Tag the docker images.
docker tag dbrepo-analyse-service:latest "${REPOSITORY_URL}/analyse-service:${APP_VERSION}"
docker tag dbrepo-auth-service:latest "${REPOSITORY_URL}/auth-service:${APP_VERSION}"
- docker tag dbrepo-metadata-db:latest "${REPOSITORY_URL}/metadata-db:${APP_VERSION}"
docker tag dbrepo-ui:latest "${REPOSITORY_URL}/ui:${APP_VERSION}"
docker tag dbrepo-data-service:latest "${REPOSITORY_URL}/data-service:${APP_VERSION}"
docker tag dbrepo-metadata-service:latest "${REPOSITORY_URL}/metadata-service:${APP_VERSION}"
@@ -18,7 +17,6 @@ tag-images: build-images ## Tag the docker images.
release-images: tag-images ## Release the docker images.
docker push "${REPOSITORY_URL}/analyse-service:${APP_VERSION}"
docker push "${REPOSITORY_URL}/auth-service:${APP_VERSION}"
- docker push "${REPOSITORY_URL}/metadata-db:${APP_VERSION}"
docker push "${REPOSITORY_URL}/ui:${APP_VERSION}"
docker push "${REPOSITORY_URL}/data-service:${APP_VERSION}"
docker push "${REPOSITORY_URL}/search-db:${APP_VERSION}"