From d7112bb9a1ac6891bbba2bb4c2c16f65337a9eb6 Mon Sep 17 00:00:00 2001 From: Mikko Nieminen Date: Tue, 31 Jan 2023 13:32:08 +0100 Subject: [PATCH] fix some setup issues (#16) --- docker/Dockerfile | 3 +++ docker/docker-entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index bd2c6fc..9e9e8c6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -57,6 +57,9 @@ RUN apt-get install -y python python-pip python-dev python3-distro sudo vim wget # Install database dependencies RUN apt-get install -y unixodbc unixodbc-dev odbc-postgresql +# Install iRODS Python dependencies +RUN pip install pyodbc + # Install iRODS RUN wget -qO - https://packages.irods.org/irods-signing-key.asc | sudo apt-key add - \ && echo "deb [arch=amd64] https://packages.irods.org/apt/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/renci-irods.list \ diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 609af78..37498c9 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -50,7 +50,7 @@ if [[ "$1" == "irods-start" ]]; then j2 -o /unattended_config.json --undefined --filters=j2-filters.py unattended_config.json.j2 echo "Perform iRODS setup" - python /var/lib/irods/scripts/setup_irods.py --json_configuration_file=/unattended_config.json + python3 /var/lib/irods/scripts/setup_irods.py --json_configuration_file=/unattended_config.json cp /var/lib/irods/.irods/irods_environment.json /etc/irods/irods_environment.json cp /var/lib/irods/.odbc.ini /etc/irods/.odbc.ini