Skip to content

Commit

Permalink
fix some setup issues (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikkonie committed Jan 31, 2023
1 parent b93cebf commit d7112bb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d7112bb

Please sign in to comment.