Skip to content

Commit

Permalink
fix version.json persistency issue (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
mikkonie committed Jan 24, 2024
1 parent 18f0a4d commit 34909f9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ Images are built and tagged for a specific iRODS release. The most recent build

Each container exposes volumes for data persistency. The list of volumes are provided in the table below:

| path in container | usage |
|---------------------------------|-------------------------------|
| /etc/irods | resource server configuration |
| /var/lib/irods/iRODS/server/log | resource server log |
| path in container | usage |
|---------------------------------|---------------------------------|
| /etc/irods | Server configuration |

For iRODS services, the setup script (`/var/lib/irods/scripts/setup_irods.py`) is only executed when the file `/etc/irods/.provisioned` is not present.
The file `/etc/irods/.provisioned` is created when the setup script is executed successfully.
Expand Down Expand Up @@ -75,7 +74,7 @@ iRODS can be run in either "provider" mode, which installs an iCAT catalogue ser

## SSSD Support

In addition to the base image, we provide the images `${VERSION}-sssd` (e.g., `4.3.1-0-sssd`) which have SSSD installed.
In addition to the base image, we provide the images `${VERSION}-sssd` (e.g., `4.3.1-0-1-sssd`) which have SSSD installed.
You will have to share `/var/lib/sss` between the SSSD container and iRODS so both containers can communicate.

In our installations, we run [bihealth/sssd-docker](https://github.com/bihealth/sssd-docker) in a second container.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RUN mkdir -p $IRODS_RESOURCE_DIRECTORY
RUN chown -cR $IRODS_SERVICE_ACCOUNT_GROUP:$IRODS_SERVICE_ACCOUNT_USER $IRODS_RESOURCE_DIRECTORY

# Data volumes
VOLUME "/etc/irods" "/var/lib/irods/iRODS/server/log"
VOLUME "/etc/irods"

# Network ports
EXPOSE 4321 $IRODS_ZONE_PORT $IRODS_CONTROL_PLANE_PORT $IRODS_DATA_PORT_RANGE_START-$IRODS_DATA_PORT_RANGE_END
Expand Down
5 changes: 5 additions & 0 deletions docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ if [[ "$1" == "irods-start" ]]; then
cp /etc/irods/.odbc.ini /var/lib/irods/.odbc.ini
fi

if [ -f /etc/irods/version.json ]; then
cp -f /etc/irods/version.json /var/lib/irods/version.json
fi

else

echo "Provisioning iRODS.."
Expand All @@ -57,6 +61,7 @@ if [[ "$1" == "irods-start" ]]; then

cp /var/lib/irods/.irods/irods_environment.json /etc/irods/irods_environment.json
cp /var/lib/irods/.odbc.ini /etc/irods/.odbc.ini
cp -f /var/lib/irods/version.json /etc/irods/version.json

# Enable the python rule engine
if [ -f /irods_python-re_installer.py ]; then
Expand Down

0 comments on commit 34909f9

Please sign in to comment.