Merge branch 'dev'

.docs/examples/lute-data.md

+---
+author: Martin Weise
+---
+
+## tl;dr
+
+tbd
+
+## Description
+
+The main aim of the E-LAUTE project is to create a novel form of music edition: an "open knowledge platform" in which 
+musicology, music practice, music informatics and literary studies intertwine and transform the "classic" edition into a 
+space of interdisciplinary and discipline-specific work. 
+
+In order to create a comprehensive, complete modern scholarly edition, the E-LAUTE project synchronises high technology
+informatics in the fields of encoding, linking, recognition (OMR) and automatic transcription with manual music 
+transcription and musical performance practice. We consider recordings of lute music a conceptual component of the 
+edition.
+
+## Solution
+
+tbd
+
+## DBRepo Features
+
+- [x] Data preservation of historic data
+- [x] Subset exploration
+- [x] External visualization of the database
+
+## Acknowledgement
+
+This work was part of a cooperation with the University of Vienna in the context of [E-LAUTE](https://e-laute.info/).
+
+<img src="../../images/logos/univie_small.png" width=100 />
\ No newline at end of file

.docs/examples/xps.md

----
-author: Martin Weise
----
-
-## tl;dr
-
-[:fontawesome-solid-database:  Dataset](https://dbrepo1.ec.tuwien.ac.at/database/27/info){ .md-button .md-button--primary target="_blank" }
-[:simple-jupyter:  Notebook](https://binder.science.datalab.tuwien.ac.at/v2/git/https%3A%2F%2Fgitlab.tuwien.ac.at%2Ffairdata%2Fxps/HEAD){ .md-button .md-button--secondary target="_blank" }
-
-## Description
-
-X-ray Photoelectron Spectroscopy (XPS) is one of the most used methods in material sciences. Irradiation of solid
-materials with X-ray radiation kicks out electrons from atoms that are near the atomic nucleus. With XPS data being
-highly reproducible once machine parameters are known and understood, the demand for creating a comprehensive database
-connecting material properties to compositions via XPS spectra becomes evident.
-
-## Solution
-
-We read XPS data from the VAMAS-encoded format and inserted it into a 
-[database schema](https://gitlab.tuwien.ac.at/fairdata/xps/-/blob/e17860399b1b109c72b01888766f37193dde5870/sql/create_schema.sql) 
-that captures the VAMAS-schema. It can then be read using the [Python Library](../../api/python).
-
-<figure markdown>
-![Jupyter Notebook](../../images/screenshots/xps-jupyter.png){ .img-border }
-<figcaption>Figure 1: Jupyter Notebook accessing data on DBRepo using the Python Library.</figcaption>
-</figure>
-
-Using the DataFrame representation of the Python Library and the [`plotly`](https://pypi.org/project/plotly/) library,
-we can visualize the ordinate values directly in the Jupyter Notebook.
-
-<figure markdown>
-![Three charts displaying surface analysis data of C, O and Su](../../images/screenshots/xps-chart.png){ .img-border }
-<figcaption>Figure 2: Plot of ordinate values encoded within the experiment block.</figcaption>
-</figure>
-
-## DBRepo Features
-
-- [x] Data preservation of VAMAS-encoded XPS data
-- [x] Subset exploration
-- [x] External visualization of the database
-- [x] Replication of experiments using only open-source software
-
-## Acknowledgement
-
-This work was part of a cooperation with the [Institute of Applied Physics](http://www.iap.tuwien.ac.at/).
-
-<img src="../../images/logos/iap.jpeg" width=100 />
\ No newline at end of file

dbrepo-analyse-service/Dockerfile

 FROM python:3.11-alpine
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add bash curl
 

dbrepo-auth-service/Dockerfile

 ###### FIRST STAGE ######
-FROM keycloak/keycloak:24.0 as config
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM keycloak/keycloak:24.0 AS config
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 # Enable health and metrics support
 ENV KC_HEALTH_ENABLED=true
@@ -17,12 +17,12 @@ COPY ./server.keystore ./conf/server.keystore
 RUN /opt/keycloak/bin/kc.sh build
 
 ###### SECOND STAGE ######
-FROM redhat/ubi9-minimal as binary
+FROM redhat/ubi9-minimal AS binary
 
 RUN microdnf update -y && microdnf install -y curl-minimal libcurl-minimal
 
 ###### THIRD STAGE ######
-FROM keycloak/keycloak:21.0 as runtime
+FROM keycloak/keycloak:21.0 AS runtime
 
 COPY --from=config /opt/keycloak/ /opt/keycloak/
 COPY --from=binary /usr/lib64 /usr/lib64

dbrepo-data-service/Dockerfile

 ###### FIRST STAGE ######
-FROM dbrepo-metadata-service:build as dependency
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM dbrepo-metadata-service:build AS dependency
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 ###### SECOND STAGE ######
-FROM maven:3-openjdk-17 as build
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM maven:3-openjdk-17 AS build
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 COPY ./pom.xml ./
 
@@ -21,8 +21,8 @@ COPY ./services ./services
 RUN mvn clean package -DskipTests
 
 ###### THIRD STAGE ######
-FROM amazoncorretto:17-alpine3.19 as runtime
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM amazoncorretto:17-alpine3.19 AS runtime
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache curl bash jq
 

dbrepo-metadata-service/Dockerfile

 ###### FIRST STAGE ######
-FROM maven:3-openjdk-17 as build
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM maven:3-openjdk-17 AS build
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 COPY ./pom.xml ./
 COPY ./api/pom.xml ./api/
@@ -27,8 +27,8 @@ COPY ./test ./test
 RUN mvn clean install -DskipTests
 
 ###### SECOND STAGE ######
-FROM amazoncorretto:17-alpine3.19 as runtime
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+FROM amazoncorretto:17-alpine3.19 AS runtime
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache curl bash jq
 

dbrepo-search-db/Dockerfile

-FROM opensearchproject/opensearch:2.10.0 as runtime
+FROM opensearchproject/opensearch:2.10.0 AS runtime
 
 USER root
 

dbrepo-search-service/Dockerfile

 FROM python:3.11-alpine
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
 
 RUN apk add --no-cache curl bash jq
 

dbrepo-storage-service/init/Dockerfile

-FROM chrislusf/seaweedfs:3.59 as runtime
+FROM chrislusf/seaweedfs:3.59 AS runtime
 
 WORKDIR /app
 

dbrepo-ui/Dockerfile

@@ -24,7 +24,7 @@ COPY ./nuxt.config.ts ./nuxt.config.ts
 
 RUN bun run build
 
-FROM oven/bun:1.0.26-alpine as runtime
+FROM oven/bun:1.0.26-alpine AS runtime
 
 ARG APP_VERSION="latest"
 ARG COMMIT=""

docker-compose.yml

@@ -94,6 +94,8 @@ services:
       KC_DB_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
       KEYCLOAK_ADMIN: "${KEYCLOAK_ADMIN:-admin}"
       KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD:-admin}"
+    volumes:
+      - identity-service-data:/bitnami/openldap
     depends_on:
       dbrepo-identity-service:
         condition: service_healthy

mkdocs.yml

@@ -49,6 +49,7 @@ nav:
     - Hazard Data: examples/hazard.md
     - Industry 4.0 Power Data: examples/power.md
     - Survey Data: examples/survey.md
+    - Lute Data: examples/lute-data.md
     - Music-ML Data: examples/music.md
     - Transportation Data: examples/transportation.md
     - XPS Data: examples/xps-data.md