diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 094f61f3d9f8ba9b4cd7460ff13e1de03438b63e..49c5261b6c32b4590f7e3bb130ebbbc67c7ac350 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -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
diff --git a/.docs/changelog.md b/.docs/changelog.md
index a77872cd47775032edc1919cb70060ec33698b69..16710374e9352a222f4fcf94d327adf0de23180d 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -6,6 +6,8 @@ author: Martin Weise
#### 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)
diff --git a/docker-compose.yml b/docker-compose.yml
index e0be02996d38a2559b941c793caa56e668f51eef..69db5103154eaaa6d8a589e87a9c1e8cc6caaf02 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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