Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • fair-data-austria-db-repository/fda-services
1 result
Select Git revision
Show changes
Commits on Source (27)
Show whitespace changes
Inline Side-by-side
Showing
with 136 additions and 137 deletions
.docker/docker-compose.yml
View file @ fed6fa45
......@@ -88,6 +88,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro-hm
platform: linux/amd64
logging:
driver: json-file
......@@ -111,6 +112,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro-hm
platform: linux/amd64
logging:
driver: json-file
......@@ -131,6 +133,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -167,6 +170,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-medium
platform: linux/amd64
depends_on:
dbrepo-identity-service:
condition: service_healthy
......@@ -190,6 +194,7 @@ services:
SYSTEM_PASSWORD: ${SYSTEM_PASSWORD:-admin}
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-auth-service:
condition: service_healthy
......@@ -248,6 +253,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-small
platform: linux/amd64
depends_on:
dbrepo-auth-service:
condition: service_healthy
......@@ -287,6 +293,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -314,6 +321,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -322,6 +330,8 @@ services:
container_name: dbrepo-search-db
hostname: search-db
image: docker.io/bitnami/opensearch:${OPENSEARCH_VERSION}
volumes:
- search-db-data:/bitnami/opensearch/data
ports:
- "9200:9200"
healthcheck:
......@@ -329,8 +339,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-medium
volumes:
- search-db-data:/bitnami/opensearch/data
platform: linux/amd64
logging:
driver: json-file
......@@ -355,6 +364,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -381,6 +391,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
depends_on:
dbrepo-search-service:
condition: service_healthy
......@@ -403,6 +414,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-analyse-service:
condition: service_healthy
......@@ -441,6 +453,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
logging:
driver: json-file
......@@ -459,6 +472,7 @@ services:
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-search-db:
condition: service_healthy
......@@ -481,6 +495,7 @@ services:
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-dashboard-ui:
condition: service_healthy
......@@ -505,6 +520,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
logging:
driver: json-file
......@@ -521,6 +537,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
logging:
driver: json-file
......@@ -537,6 +554,7 @@ services:
STORAGE_ENDPOINT: ${STORAGE_ENDPOINT:-http://storage-service:9000}
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-storage-service:
condition: service_healthy
......@@ -584,6 +602,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-large
platform: linux/amd64
depends_on:
dbrepo-data-db:
condition: service_healthy
......@@ -612,6 +631,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
extra_hosts:
- "localhost:host-gateway"
logging:
......@@ -635,6 +655,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
depends_on:
dbrepo-dashboard-ui:
condition: service_healthy
......
.docs/.gitignore 0 → 100644
View file @ fed6fa45
# CSS
stylesheets/.sass-cache/
\ No newline at end of file
.docs/changelog.md
View file @ fed6fa45
......@@ -2,10 +2,28 @@
author: Martin Weise
---
## v1.8.1 (2025-04-??)
## v1.8.2 (2025-04-??)
#### Features
* Added structured logging through the `fluentd` protocol via the lightweight fluentbit in a
separate [Logging Service](../api/logging-service)
in [#524](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/524).
#### Changes
* Improved internal packaging mechanism that is compatible with multiarch deployments
in [#523](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/523).
## v1.8.1 (2025-04-13)
#### Changes
* Improved default mask for PIDs
in [#521](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/521).
* Added a visual filter for displaying starred/unstarred/all subsets in the UI.
* Specified image platform as `linux/amd64` in `docker-compose.yaml` deployment to enable host platform (e.g. ARM) to
emulate it.
* Specified resource limits in the `docker-compose.yaml` deployment
in [#517](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/517).
......@@ -13,9 +31,9 @@ author: Martin Weise
* Fixed a bug in the UI that displays the "Create View" button only when the user has at least read access.
#### Changes
#### Removals
* Refactored stale objects scheduler from the Data Service into a separate image.
* Removed the stale objects scheduler from the Data Service and pushed it to next release.
## v1.8.0 (2025-04-04)
......
.docs/images/architecture.drawio
View file @ fed6fa45
......@@ -975,113 +975,95 @@
</mxGraphModel>
</diagram>
<diagram id="DNBJDzVGt1bZ_wE9aRrb" name="Authentication (TU)">
<mxGraphModel dx="1434" dy="822" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<mxGraphModel dx="1182" dy="678" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
<mxCell id="UK1E1MY9NPGJr35xhmfM-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="6Mvu0cpha-60HerBRlcp-5" target="QHHrKqhJkxuvhbEd7n-v-1" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="618" y="253" as="sourcePoint" />
<mxPoint x="677.5" y="221" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="0UriubutAV_ndhbAIQOG-1" target="lwbPPWB284nzco3shXtu-11" edge="1">
<mxCell id="H5geC8BQpTcnQeXLB8gK-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-2">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="0UriubutAV_ndhbAIQOG-1" value="SATOSA" style="rounded=0;whiteSpace=wrap;html=1;fillColor=default;dashed=1;verticalAlign=top;" parent="1" vertex="1">
<mxGeometry x="447.5" y="414" width="170" height="210" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-4" value="Force" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-3">
<mxGeometry x="0.0781" y="-2" relative="1" as="geometry">
<mxPoint x="7" y="2" as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="h4DClbYJ9orVhpn0rvY8-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="OTtTGdUG0AnkBV5d_5uu-1" target="OTtTGdUG0AnkBV5d_5uu-2" edge="1">
<mxCell id="H5geC8BQpTcnQeXLB8gK-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-5">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="OTtTGdUG0AnkBV5d_5uu-1" value="SAML 2.0 IdP&lt;br&gt;(Frontend)" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="467.5" y="444" width="130" height="40" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-20" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-9">
<mxGeometry x="-0.0962" y="-1" relative="1" as="geometry">
<mxPoint x="6" y="-1" as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="h4DClbYJ9orVhpn0rvY8-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="OTtTGdUG0AnkBV5d_5uu-2" target="OTtTGdUG0AnkBV5d_5uu-3" edge="1">
<mxCell id="H5geC8BQpTcnQeXLB8gK-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-7">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="OTtTGdUG0AnkBV5d_5uu-2" value="Middleware" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="467.5" y="504" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="OTtTGdUG0AnkBV5d_5uu-3" value="SAML 2.0 SP&lt;br&gt;(Backend)" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="467.5" y="564" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="h4DClbYJ9orVhpn0rvY8-2" value="&lt;a href=&quot;https://test.dbrepo.tuwien.ac.at/api/auth/realms/dbrepo/.well-known/openid-configuration&quot;&gt;JSON&lt;br&gt;Metadata&lt;/a&gt;" style="shape=note;whiteSpace=wrap;html=1;backgroundOutline=1;darkOpacity=0.05;size=17;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
<mxGeometry x="307.5" y="181" width="70" height="90" as="geometry" />
</mxCell>
<mxCell id="lwbPPWB284nzco3shXtu-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="h4DClbYJ9orVhpn0rvY8-3" target="OTtTGdUG0AnkBV5d_5uu-3" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="410" y="576" as="targetPoint" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-19" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-10">
<mxGeometry x="-0.1281" y="2" relative="1" as="geometry">
<mxPoint x="-2" as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="h4DClbYJ9orVhpn0rvY8-3" value="&lt;a href=&quot;https://test.dbrepo.tuwien.ac.at/saml2/endpoint&quot;&gt;XML&lt;br&gt;Metadata&lt;/a&gt;" style="shape=note;whiteSpace=wrap;html=1;backgroundOutline=1;darkOpacity=0.05;size=17;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
<mxGeometry x="307.5" y="539" width="70" height="90" as="geometry" />
</mxCell>
<mxCell id="QHHrKqhJkxuvhbEd7n-v-1" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
<mxGeometry x="677.5" y="248" width="50" height="64" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-6">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="QHHrKqhJkxuvhbEd7n-v-2" value="auth-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
<mxGeometry x="660" y="314" width="85" height="20" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-18" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-11">
<mxGeometry x="0.1536" relative="1" as="geometry">
<mxPoint x="9" as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="hp2oGXdcphavrsRCR3EN-1" value="&lt;b&gt;EntityID&amp;nbsp;&lt;/b&gt;https://test.dbrepo.tuwien.ac.at/saml2/backend" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
<mxGeometry x="10" y="10" width="440" height="20" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-1" value="&lt;b&gt;Auth Service&lt;/b&gt;&lt;br&gt;Keycloak" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="455" y="335" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="lwbPPWB284nzco3shXtu-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;dashed=1;" parent="1" source="lwbPPWB284nzco3shXtu-11" target="h4DClbYJ9orVhpn0rvY8-3" edge="1">
<mxCell id="H5geC8BQpTcnQeXLB8gK-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-2" target="H5geC8BQpTcnQeXLB8gK-8">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="lwbPPWB284nzco3shXtu-11" value="TU SSO" style="rounded=0;whiteSpace=wrap;html=1;fillColor=default;dashed=1;verticalAlign=top;" parent="1" vertex="1">
<mxGeometry x="50" y="474" width="170" height="90" as="geometry" />
</mxCell>
<mxCell id="lwbPPWB284nzco3shXtu-12" value="SimpleSAML" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
<mxGeometry x="70" y="504" width="130" height="40" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-16" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-12">
<mxGeometry x="-0.0986" y="-1" relative="1" as="geometry">
<mxPoint as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="lwbPPWB284nzco3shXtu-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="lwbPPWB284nzco3shXtu-18" target="OTtTGdUG0AnkBV5d_5uu-1" edge="1">
<mxCell id="H5geC8BQpTcnQeXLB8gK-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-2" target="H5geC8BQpTcnQeXLB8gK-13">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="lwbPPWB284nzco3shXtu-18" value="&lt;a href=&quot;https://test.dbrepo.tuwien.ac.at/saml2/backend&quot;&gt;XML&lt;br&gt;Metadata&lt;/a&gt;" style="shape=note;whiteSpace=wrap;html=1;backgroundOutline=1;darkOpacity=0.05;size=17;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
<mxGeometry x="307.5" y="419" width="70" height="90" as="geometry" />
</mxCell>
<mxCell id="tOMRmRFzJHC1-SXyWV1O-3" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#000000;startArrow=classic;startFill=1;dashed=1;" parent="1" edge="1">
<mxGeometry x="-0.028" relative="1" as="geometry">
<mxPoint x="532" y="126" as="sourcePoint" />
<mxPoint as="offset" />
<mxPoint x="532" y="174" as="targetPoint" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-17" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-15">
<mxGeometry x="0.0932" y="-2" relative="1" as="geometry">
<mxPoint x="6" y="1" as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="tOMRmRFzJHC1-SXyWV1O-4" value="Researcher" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
<mxGeometry x="517.5" y="42" width="30" height="60" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-2" value="&lt;b&gt;Identity Service&lt;/b&gt;&lt;br&gt;OpenLDAP" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="224" y="335" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-4" value="&lt;a href=&quot;https://test.dbrepo.tuwien.ac.at/api/auth/realms/dbrepo/broker/saml/endpoint/descriptor&quot;&gt;XML&lt;br&gt;Metadata&lt;/a&gt;" style="shape=note;whiteSpace=wrap;html=1;backgroundOutline=1;darkOpacity=0.05;size=17;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
<mxGeometry x="307.5" y="300" width="70" height="90" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-5" value="&lt;b&gt;UI&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="530" y="470" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-5" value="Keycloak" style="rounded=0;whiteSpace=wrap;html=1;fillColor=default;dashed=1;verticalAlign=top;" parent="1" vertex="1">
<mxGeometry x="447.5" y="175" width="170" height="210" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-6" value="&lt;b&gt;Metadata Service&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="380" y="470" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="6Mvu0cpha-60HerBRlcp-7" target="6Mvu0cpha-60HerBRlcp-10" edge="1">
<mxGeometry relative="1" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-7" value="&lt;b&gt;Data Service&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="455" y="530" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-7" value="OIDC IdP" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="467.5" y="205" width="130" height="40" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-8" value="&lt;b&gt;Broker Service&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="224" y="530" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="6Mvu0cpha-60HerBRlcp-5" target="0UriubutAV_ndhbAIQOG-1" edge="1">
<mxGeometry relative="1" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-13" value="&lt;b&gt;Dashboard UI&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
<mxGeometry x="150" y="470" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-10" value="SAML 2.0 SP&lt;br&gt;(Identity Broker)" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
<mxGeometry x="467.5" y="325" width="130" height="40" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-21" target="H5geC8BQpTcnQeXLB8gK-1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="lwbPPWB284nzco3shXtu-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="h4DClbYJ9orVhpn0rvY8-2" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="467.5" y="226" as="targetPoint" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-23" value="SAML 2.0" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-22">
<mxGeometry x="0.0113" y="1" relative="1" as="geometry">
<mxPoint as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="6Mvu0cpha-60HerBRlcp-4" target="6Mvu0cpha-60HerBRlcp-10" edge="1">
<mxGeometry relative="1" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-21" value="&lt;b&gt;IdP&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" vertex="1" parent="1">
<mxGeometry x="455" y="190" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="6Mvu0cpha-60HerBRlcp-15" target="OTtTGdUG0AnkBV5d_5uu-1" edge="1">
<mxCell id="H5geC8BQpTcnQeXLB8gK-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-24" target="H5geC8BQpTcnQeXLB8gK-1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="6Mvu0cpha-60HerBRlcp-15" value="JSON&lt;br&gt;(Denylist)" style="shape=note;whiteSpace=wrap;html=1;backgroundOutline=1;darkOpacity=0.05;size=17;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
<mxGeometry x="667.5" y="419" width="70" height="90" as="geometry" />
<mxCell id="H5geC8BQpTcnQeXLB8gK-24" value="Browser / REST API" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" vertex="1" parent="1">
<mxGeometry x="730" y="325" width="30" height="60" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
......
.docs/installation.md
View file @ fed6fa45
......@@ -22,13 +22,10 @@ curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-service
## Requirements
We only support the Debian 12 operating system officially. In theory, any DEB-based operating system (e.g. Ubuntu)
should be compatible. Any modern hardware suffices, we recommend a dedicated virtual machine with the following
settings.
We recommend a dedicated virtual machine with the following system requirements:
- min. 8 vCPU cores
- min. 8GB free RAM memory
- min. 200GB free SSD storage
- min. 20GB free RAM memory
Since DBRepo is intended to be a publicly available repository, an optional fixed/static IP-address with optional
SSL/TLS certificate is recommended. Follow the [secure installation](#secure-installation) guide.
......
.docs/overrides/main.html 0 → 100644
View file @ fed6fa45
{% extends "base.html" %}
{% block outdated %}
<strong>WARNING</strong> You're browsing the documentation for an old version of DBRepo. Consider upgrading your project
to <a href="{{ config.site_url }}">
<strong>the latest version</strong>.
</a>
{% endblock %}
\ No newline at end of file
.docs/stylesheets/extra.css
View file @ fed6fa45
......@@ -29,8 +29,3 @@ img.img-border {
.md-main .md-content a:not(.action-button):not([tabindex]):hover {
color: var(--md-primary-fg-color--dark);
border-bottom: 2px solid var(--md-primary-fg-color--dark); }
.md-banner {
background-color: var(--md-primary-fg-color--dark); }
/*# sourceMappingURL=extra.css.map */
.docs/stylesheets/extra.scss
View file @ fed6fa45
......@@ -39,6 +39,6 @@ img.img-border {
}
.md-banner {
background-color: var(--md-primary-fg-color--dark);
}
\ No newline at end of file
//.md-banner {
// background-color: var(--md-primary-fg-color--dark);
//}
\ No newline at end of file
.gitignore
View file @ fed6fa45
......@@ -4,7 +4,6 @@ target/
!**/src/main/**/target/
!**/src/test/**/target/
.docker/
# generated
ready
schema.xsd
......@@ -21,7 +20,6 @@ tmp.yaml
.docs/.swagger/dist/
.docs/.swagger/site/
site/
final/
.$*
dbrepo-somapper/
......@@ -30,9 +28,6 @@ dbrepo-somapper/
.pytest_cache/
__pycache__/
# docs
site/
# Previous directories
fda-analyse-service/
fda-authentication-service/
......@@ -53,9 +48,6 @@ fda-ui/
# demo
.demo
# Generated
ready
# Certificates
*.crt
*.p12
......@@ -106,7 +98,6 @@ table.md
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
......
.gitlab-ci.yml
View file @ fed6fa45
......@@ -15,6 +15,7 @@ variables:
APP_VERSION: "1.8.1"
CHART_VERSION: "1.8.1"
SUPPORTED_VERSIONS: "1.7.3, 1.8.0, 1.8.1"
SUPPORTED_ARCH: "linux/amd64"
MAINTAINED_SERVICES: "analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-db, search-service, search-service-init, storage-service-init, ui"
CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
......@@ -154,10 +155,10 @@ build-metadata-service:
- master
needs:
- build-java-lib
dependencies:
- build-java-lib
before_script:
- mvn -f ./lib/java/dbrepo-core/pom.xml -q clean install $MAVEN_OPTS -DskipTests
script:
- "mvn -f ./dbrepo-metadata-service/pom.xml clean package $MAVEN_OPTS -DskipTests"
- "mvn -f ./dbrepo-metadata-service/pom.xml -q clean package $MAVEN_OPTS -DskipTests"
# Compiled classes are needed for SonarQube in later stages
artifacts:
when: always
......@@ -199,11 +200,15 @@ build-java-lib:
- merge_requests
- master
script:
- "mvn -f ./lib/java/dbrepo-core/pom.xml clean install $MAVEN_OPTS -DskipTests"
- "mvn -f ./lib/java/dbrepo-core/pom.xml clean package install $MAVEN_OPTS -DskipTests"
- "mvn deploy:deploy-file $MAVEN_OPTS -Dfile=./lib/java/dbrepo-core/target/dbrepo-core-$APP_VERSION.jar -DgroupId=at.ac.tuwien.ifs.dbrepo -DartifactId=dbrepo-core -Dversion=$APP_VERSION -Dpackaging=jar -Durl=file:./dbrepo-data-service/lib/ -DrepositoryId=maven-repository -DupdateReleaseInfo=true"
- "mvn deploy:deploy-file $MAVEN_OPTS -Dfile=./lib/java/dbrepo-core/target/dbrepo-core-$APP_VERSION.jar -DgroupId=at.ac.tuwien.ifs.dbrepo -DartifactId=dbrepo-core -Dversion=$APP_VERSION -Dpackaging=jar -Durl=file:./dbrepo-metadata-service/lib/ -DrepositoryId=maven-repository -DupdateReleaseInfo=true"
artifacts:
when: always
paths:
- ./lib/java/dbrepo-core/target/classes
- ./dbrepo-data-service/lib
- ./dbrepo-metadata-service/lib
build-data-service:
image: maven:3-openjdk-${JAVA_VERSION}
......@@ -215,8 +220,10 @@ build-data-service:
- build-java-lib
dependencies:
- build-java-lib
before_script:
- mvn -f ./lib/java/dbrepo-core/pom.xml -q clean install $MAVEN_OPTS -DskipTests
script:
- "mvn -f ./dbrepo-data-service/pom.xml clean package $MAVEN_OPTS -DskipTests"
- "mvn -f ./dbrepo-data-service/pom.xml -q clean package $MAVEN_OPTS -DskipTests"
# Compiled classes are needed for SonarQube in later stages
artifacts:
when: always
......@@ -263,14 +270,13 @@ build-images:
only:
- merge_requests
- master
variables:
DOCKER_BUILDKIT: 1
before_script:
- "apk add --no-cache make"
- "apk add --no-cache make maven openjdk17-jdk"
- echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
script:
- docker build --network=host -t dbrepo-core:build --target build ./lib/java/dbrepo-core
- docker build --network=host -t dbrepo-data-service:build --target build dbrepo-data-service
- docker build --network=host -t dbrepo-metadata-service:build --target build dbrepo-metadata-service
- docker compose build -q --parallel
- make build-images
build-helm:
image: docker.io/docker:${DOCKER_VERSION}-dind
......@@ -294,6 +300,7 @@ test-metadata-service:
- master
needs:
- build-java-lib
- build-metadata-service
dependencies:
- build-java-lib
script:
......@@ -316,11 +323,11 @@ test-data-service:
- merge_requests
- master
needs:
- build-java-lib
- build-data-service
dependencies:
- build-data-service
- build-java-lib
script:
- "mvn -f ./dbrepo-metadata-service/pom.xml clean install -DskipTests $MAVEN_OPTS"
- "mvn -f ./dbrepo-data-service/pom.xml clean test verify $MAVEN_OPTS"
- "cat ./dbrepo-data-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
artifacts:
......@@ -521,6 +528,8 @@ clean-images:
release-images:
stage: release
image: docker:${DOCKER_VERSION}-dind
variables:
REPOSITORY_URL: $CI_REGISTRY2_URL
dependencies:
- clean-images
- test-analyse-service
......@@ -534,37 +543,13 @@ release-images:
- tags
- dev
before_script:
- "apk add --no-cache make maven openjdk17-jdk"
- "docker logout ${CI_REGISTRY_URL}"
- "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}"
script:
- docker build --network=host -t dbrepo-core:build --target build ./lib/java/dbrepo-core
- docker build --network=host -t dbrepo-data-service:build --target build dbrepo-data-service
- docker build --network=host -t dbrepo-metadata-service:build --target build dbrepo-metadata-service
- docker compose build -q --parallel
- docker tag dbrepo-analyse-service:latest "${CI_REGISTRY2_URL}/analyse-service:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-auth-service-init:latest "${CI_REGISTRY2_URL}/auth-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-dashboard-service:latest "${CI_REGISTRY2_URL}/dashboard-service:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-dashboard-service-init:latest "${CI_REGISTRY2_URL}/dashboard-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-dashboard-ui:latest "${CI_REGISTRY2_URL}/dashboard-ui:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-data-service:latest "${CI_REGISTRY2_URL}/data-service:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-metadata-service:latest "${CI_REGISTRY2_URL}/metadata-service:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-search-service:latest "${CI_REGISTRY2_URL}/search-service:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-search-service-init:latest "${CI_REGISTRY2_URL}/search-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-storage-service-init:latest "${CI_REGISTRY2_URL}/storage-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker tag dbrepo-ui:latest "${CI_REGISTRY2_URL}/ui:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/analyse-service:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/auth-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/dashboard-service:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/dashboard-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/dashboard-ui:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/data-service:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/metadata-service:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/search-service:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/search-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/storage-service-init:${APP_VERSION}${BUILD_VERSION}"
- docker push "${CI_REGISTRY2_URL}/ui:${APP_VERSION}${BUILD_VERSION}"
- "make release-images"
release-helm:
stage: release
......