Skip to content

Commit

Permalink
Fix provider docker
Browse files Browse the repository at this point in the history
  • Loading branch information
lwesterhof committed Dec 11, 2024
1 parent 9940d8a commit 244ad11
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docker/down.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
docker-compose down "$@"
docker compose down "$@"
15 changes: 9 additions & 6 deletions docker/images/yoda_irods_icat/irods-icat-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/up.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
docker-compose up "$@"
docker compose up "$@"

0 comments on commit 244ad11

Please sign in to comment.