Skip to content
Snippets Groups Projects
Commit 789daecb authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'dev'

parents 7d2cb36b d20d7351
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.docker/docker-compose.yml
+ 23
− 2
View file @ 789daecb
......@@ -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/changelog.md
+ 5
− 3
View file @ 789daecb
......@@ -2,10 +2,12 @@
author: Martin Weise
---
## v1.8.1 (2025-04-??)
## v1.8.1 (2025-04-13)
#### Changes
* 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 +15,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)
......
docker-compose.yml
+ 23
− 2
View file @ 789daecb
......@@ -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
......@@ -133,6 +135,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -169,6 +172,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-medium
platform: linux/amd64
depends_on:
dbrepo-identity-service:
condition: service_healthy
......@@ -195,6 +199,7 @@ services:
SYSTEM_PASSWORD: ${SYSTEM_PASSWORD:-admin}
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-auth-service:
condition: service_healthy
......@@ -258,6 +263,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-small
platform: linux/amd64
depends_on:
dbrepo-auth-service:
condition: service_healthy
......@@ -302,6 +308,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -330,6 +337,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -338,6 +346,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:
......@@ -345,8 +355,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-medium
volumes:
- search-db-data:/bitnami/opensearch/data
platform: linux/amd64
logging:
driver: json-file
......@@ -376,6 +385,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
logging:
driver: json-file
......@@ -408,6 +418,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
depends_on:
dbrepo-search-service:
condition: service_healthy
......@@ -430,6 +441,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-analyse-service:
condition: service_healthy
......@@ -471,6 +483,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
logging:
driver: json-file
......@@ -493,6 +506,7 @@ services:
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-search-db:
condition: service_healthy
......@@ -519,6 +533,7 @@ services:
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-dashboard-ui:
condition: service_healthy
......@@ -543,6 +558,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
logging:
driver: json-file
......@@ -559,6 +575,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
logging:
driver: json-file
......@@ -578,6 +595,7 @@ services:
STORAGE_ENDPOINT: ${STORAGE_ENDPOINT:-http://storage-service:9000}
deploy:
<<: *resources-nano
platform: linux/amd64
depends_on:
dbrepo-storage-service:
condition: service_healthy
......@@ -630,6 +648,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-large
platform: linux/amd64
depends_on:
dbrepo-data-db:
condition: service_healthy
......@@ -662,6 +681,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-nano
platform: linux/amd64
extra_hosts:
- "localhost:host-gateway"
logging:
......@@ -688,6 +708,7 @@ services:
<<: *healthcheck-params
deploy:
<<: *resources-micro
platform: linux/amd64
depends_on:
dbrepo-dashboard-ui:
condition: service_healthy
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment