From 35b658cccaba2bd52f60b61461443065e3646847 Mon Sep 17 00:00:00 2001
From: Sietse Snel <s.t.snel@uu.nl>
Date: Thu, 29 Feb 2024 17:39:25 +0100
Subject: [PATCH] Docker Compose setup: adjust for 1.9.x

Ensure that 1.9 version of images is used for Docker setup in
release-1.9 branch.
---
 docker/compose-with-bind-mounts/docker-compose.yml | 14 +++++++-------
 docker/compose/docker-compose.yml                  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docker/compose-with-bind-mounts/docker-compose.yml b/docker/compose-with-bind-mounts/docker-compose.yml
index 433279220..6247afdfc 100644
--- a/docker/compose-with-bind-mounts/docker-compose.yml
+++ b/docker/compose-with-bind-mounts/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     container_name: provider.yoda
     platform: linux/amd64
     hostname: provider.yoda
-    image: ghcr.io/utrechtuniversity/yoda-provider:development
+    image: ghcr.io/utrechtuniversity/yoda-provider:release-1.9
     ports:
       - "8247:1247"
       - "20000-20199:20000-20199"
@@ -61,7 +61,7 @@ services:
     container_name: portal.yoda
     platform: linux/amd64
     hostname: portal.yoda
-    image: ghcr.io/utrechtuniversity/yoda-portal:development
+    image: ghcr.io/utrechtuniversity/yoda-portal:release-1.9
     depends_on:
       - provider
       - eus
@@ -79,7 +79,7 @@ services:
     container_name: eus.yoda
     platform: linux/amd64
     hostname: eus.yoda
-    image: ghcr.io/utrechtuniversity/yoda-eus:development
+    image: ghcr.io/utrechtuniversity/yoda-eus:release-1.9
     depends_on:
       - extuserdb
       - mailpit
@@ -100,7 +100,7 @@ services:
     container_name: public.yoda
     platform: linux/amd64
     hostname: public.yoda
-    image: ghcr.io/utrechtuniversity/yoda-public:development
+    image: ghcr.io/utrechtuniversity/yoda-public:release-1.9
     ports:
       - "8446:443"
     build:
@@ -117,7 +117,7 @@ services:
     container_name: data.yoda
     platform: linux/amd64
     hostname: data.yoda
-    image: ghcr.io/utrechtuniversity/davrods:development
+    image: ghcr.io/utrechtuniversity/davrods:release-1.9
     depends_on:
       - provider
     ports:
@@ -130,7 +130,7 @@ services:
     container_name: mailpit.yoda
     platform: linux/amd64
     hostname: mailpit.yoda
-    image: ghcr.io/utrechtuniversity/yoda-mailpit:development
+    image: ghcr.io/utrechtuniversity/yoda-mailpit:release-1.9
     environment:
       - TZ=Europe/Amsterdam
     build:
@@ -143,7 +143,7 @@ services:
     container_name: datacite-mock.yoda
     platform: linux/amd64
     hostname: datacite-mock.yoda
-    image: ghcr.io/utrechtuniversity/yoda-web-mock:development
+    image: ghcr.io/utrechtuniversity/yoda-web-mock:release-1.9
     environment:
       - MOCKNAME=datacite
       - MOCKFQDN=datacite-mock.yoda
diff --git a/docker/compose/docker-compose.yml b/docker/compose/docker-compose.yml
index 96d13851b..7cf9ca037 100644
--- a/docker/compose/docker-compose.yml
+++ b/docker/compose/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     container_name: provider.yoda
     platform: linux/amd64
     hostname: provider.yoda
-    image: ghcr.io/utrechtuniversity/yoda-provider:development
+    image: ghcr.io/utrechtuniversity/yoda-provider:release-1.9
     ports:
       - "8247:1247"
       - "20000-20199:20000-20199"
@@ -55,7 +55,7 @@ services:
     container_name: portal.yoda
     platform: linux/amd64
     hostname: portal.yoda
-    image: ghcr.io/utrechtuniversity/yoda-portal:development
+    image: ghcr.io/utrechtuniversity/yoda-portal:release-1.9
     depends_on:
       - provider
       - eus
@@ -69,7 +69,7 @@ services:
     container_name: eus.yoda
     platform: linux/amd64
     hostname: eus.yoda
-    image: ghcr.io/utrechtuniversity/yoda-eus:development
+    image: ghcr.io/utrechtuniversity/yoda-eus:release-1.9
     depends_on:
       - extuserdb
       - mailpit
@@ -83,7 +83,7 @@ services:
     container_name: public.yoda
     platform: linux/amd64
     hostname: public.yoda
-    image: ghcr.io/utrechtuniversity/yoda-public:development
+    image: ghcr.io/utrechtuniversity/yoda-public:release-1.9
     ports:
       - "8446:443"
     build:
@@ -97,7 +97,7 @@ services:
     container_name: data.yoda
     platform: linux/amd64
     hostname: data.yoda
-    image: ghcr.io/utrechtuniversity/davrods:development
+    image: ghcr.io/utrechtuniversity/davrods:release-1.9
     depends_on:
       - provider
     ports:
@@ -110,7 +110,7 @@ services:
     container_name: mailpit.yoda
     platform: linux/amd64
     hostname: mailpit.yoda
-    image: ghcr.io/utrechtuniversity/yoda-mailpit:development
+    image: ghcr.io/utrechtuniversity/yoda-mailpit:release-1.9
     environment:
       - TZ=Europe/Amsterdam
     build:
@@ -123,7 +123,7 @@ services:
     container_name: datacite-mock.yoda
     platform: linux/amd64
     hostname: datacite-mock.yoda
-    image: ghcr.io/utrechtuniversity/yoda-web-mock:development
+    image: ghcr.io/utrechtuniversity/yoda-web-mock:release-1.9
     environment:
       - MOCKNAME=datacite
       - MOCKFQDN=datacite-mock.yoda