From 244ad11b2fa7ff75e1915361f24a40488365f3c3 Mon Sep 17 00:00:00 2001
From: Lazlo Westerhof <l.r.westerhof@uu.nl>
Date: Wed, 11 Dec 2024 14:47:14 +0100
Subject: [PATCH] Fix provider docker

---
 docker/down.sh                                   |  2 +-
 docker/images/yoda_irods_icat/irods-icat-init.sh | 15 +++++++++------
 docker/up.sh                                     |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker/down.sh b/docker/down.sh
index 043cfe063..8c1b525b2 100755
--- a/docker/down.sh
+++ b/docker/down.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose down "$@"
+docker compose down "$@"
diff --git a/docker/images/yoda_irods_icat/irods-icat-init.sh b/docker/images/yoda_irods_icat/irods-icat-init.sh
index 2afe9fe06..7f39063ad 100644
--- a/docker/images/yoda_irods_icat/irods-icat-init.sh
+++ b/docker/images/yoda_irods_icat/irods-icat-init.sh
@@ -42,7 +42,10 @@ fi
 
 # Download test vault and iCAT data
 before_update "Downloading data"
-mkdir /download
+if [ ! -d /download ] 
+then
+    mkdir /download
+fi
 wget -q "https://yoda.uu.nl/yoda-docker/${DATA_VERSION}.vault.tar.gz" -O "/download/${DATA_VERSION}.vault.tar.gz"
 progress_update "Downloaded vault test data."
 wget -q "https://yoda.uu.nl/yoda-docker/${DATA_VERSION}.icat.sql.gz" -O "/download/${DATA_VERSION}.icat.sql.gz"
@@ -83,10 +86,10 @@ progress_update "iCAT database data loaded"
 INSTALL_TIMESTAMP=$(date +'%Y-%m-%dT%H:%M:%S.000000')
 cat > /var/lib/irods/VERSION.json << VERSION
 {
-    "catalog_schema_version": 8, 
+    "catalog_schema_version": 8,
     "commit_id": "2ed549ca7fe455aaa7755becc6c14b233dcbc0b4",
-    "configuration_schema_version": 3, 
-    "installation_time": "$INSTALL_TIMESTAMP", 
+    "configuration_schema_version": 3,
+    "installation_time": "$INSTALL_TIMESTAMP",
     "irods_version": "4.3.3"
 }
 VERSION
@@ -131,8 +134,8 @@ make install
 progress_update "Ruleset updated"
 
 before_update "Updating ruleset dependencies"
-sudo -u irods pip3 install --user attrs==24.2.0
-sudo -u irods pip3 install --user -r /etc/irods/yoda-ruleset/requirements.txt
+sudo -u irods pip3 install --user --break-system-packages attrs==24.2.0
+sudo -u irods pip3 install --user --break-system-packages -r /etc/irods/yoda-ruleset/requirements.txt
 progress_update "Ruleset dependencies updated"
 
 touch /container_initialized
diff --git a/docker/up.sh b/docker/up.sh
index 7d083edad..61d472be2 100755
--- a/docker/up.sh
+++ b/docker/up.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose up "$@"
+docker compose up "$@"