diff --git a/.docs/examples/lute-data.md b/.docs/examples/lute-data.md new file mode 100644 index 0000000000000000000000000000000000000000..bceecd90529a6dc47bc0ac44895cc1847daf0121 --- /dev/null +++ b/.docs/examples/lute-data.md @@ -0,0 +1,34 @@ +--- +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 diff --git a/.docs/examples/xps.md b/.docs/examples/xps.md deleted file mode 100644 index 08abcd35bcf0eb4bf6aeb77dd8b859b002494fb3..0000000000000000000000000000000000000000 --- a/.docs/examples/xps.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -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> -{ .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> -{ .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 diff --git a/.docs/images/logos/univie_small.png b/.docs/images/logos/univie_small.png new file mode 100644 index 0000000000000000000000000000000000000000..320ae9de895106118db0cc2453317375db04e179 Binary files /dev/null and b/.docs/images/logos/univie_small.png differ diff --git a/dbrepo-analyse-service/Dockerfile b/dbrepo-analyse-service/Dockerfile index 980c11cd19227b9e08627b690e74565791a3cf30..97b181c76e3e5207dc145ba2d02f45c78fb27e71 100644 --- a/dbrepo-analyse-service/Dockerfile +++ b/dbrepo-analyse-service/Dockerfile @@ -1,5 +1,5 @@ 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 diff --git a/dbrepo-auth-service/Dockerfile b/dbrepo-auth-service/Dockerfile index 8caf422498607d1106adad82aab76d53190713d0..47fabff4ed802e5ccf1f066250b174a04f041847 100644 --- a/dbrepo-auth-service/Dockerfile +++ b/dbrepo-auth-service/Dockerfile @@ -1,6 +1,6 @@ ###### 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 diff --git a/dbrepo-data-service/Dockerfile b/dbrepo-data-service/Dockerfile index 806908a8affe8d64b0aa3d6927418eaed8cd1e1e..bd6d428695f2b85126a0a1b4dea604667510198c 100644 --- a/dbrepo-data-service/Dockerfile +++ b/dbrepo-data-service/Dockerfile @@ -1,10 +1,10 @@ ###### 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 diff --git a/dbrepo-metadata-service/Dockerfile b/dbrepo-metadata-service/Dockerfile index 1a37bf7e7e0a87c9c4e9caac814f005b3847badf..74e82043731ab8970c2d42b58032f2b5e5b00f3c 100644 --- a/dbrepo-metadata-service/Dockerfile +++ b/dbrepo-metadata-service/Dockerfile @@ -1,6 +1,6 @@ ###### 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 diff --git a/dbrepo-search-db/Dockerfile b/dbrepo-search-db/Dockerfile index 083994b580500a7aff5d6b2b7c1f26b8f86c8580..c597506dcac4af92165a78fea9ed19af9f34c9b4 100644 --- a/dbrepo-search-db/Dockerfile +++ b/dbrepo-search-db/Dockerfile @@ -1,4 +1,4 @@ -FROM opensearchproject/opensearch:2.10.0 as runtime +FROM opensearchproject/opensearch:2.10.0 AS runtime USER root diff --git a/dbrepo-search-service/Dockerfile b/dbrepo-search-service/Dockerfile index 875a9f28bdce23969ac1687e3a2af6fd8b6d0ccf..35427f81a429f8a61bd724f7bb8141b734d5013f 100644 --- a/dbrepo-search-service/Dockerfile +++ b/dbrepo-search-service/Dockerfile @@ -1,5 +1,5 @@ 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 diff --git a/dbrepo-storage-service/init/Dockerfile b/dbrepo-storage-service/init/Dockerfile index 72b080d6ce059260eb16f3a703ec45dd0d77d8c6..4a35534fb2f2261c4d732007cd013a80c3064b0b 100644 --- a/dbrepo-storage-service/init/Dockerfile +++ b/dbrepo-storage-service/init/Dockerfile @@ -1,4 +1,4 @@ -FROM chrislusf/seaweedfs:3.59 as runtime +FROM chrislusf/seaweedfs:3.59 AS runtime WORKDIR /app diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile index d7b63d8f89b577a05878eb591b40f171e9431e0e..33f62cce86a6c5f794db08c0555a8b2ffeb4a935 100644 --- a/dbrepo-ui/Dockerfile +++ b/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="" diff --git a/docker-compose.yml b/docker-compose.yml index 85da1f0b551f6ba0bd97779e5713cf1476451d0f..17a342f032b608ba6bc00f03ebefda7440d2f245 100644 --- a/docker-compose.yml +++ b/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 diff --git a/mkdocs.yml b/mkdocs.yml index 45e06cbe388165e317e3a520d0b5ad00a8995449..9bb4588f27727a8e7926caf585094989553957fa 100644 --- a/mkdocs.yml +++ b/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