add s3fs in docker

aces · Oct 18, 2024 · 25bd52d · 25bd52d
1 parent ac0c0a0
commit 25bd52d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -11,6 +11,10 @@ env:
   DATABASE_NAME: TestDatabase
   DATABASE_USERNAME: TestUsername
   DATABASE_PASSWORD: TestPassword
+  BUCKET_URL: https://ace-minio-1.loris.ca:9000
+  BUCKET_NAME: loris-rb-data
+  BUCKET_ACCESS_KEY: lorisadmin
+  BUCKET_SECRET_KEY: dmwCdAZJ=9HwMte
 
 jobs:
   docker:
@@ -52,10 +56,26 @@ jobs:
           DATABASE_NAME=${{ env.DATABASE_NAME }}
           DATABASE_USER=${{ env.DATABASE_USERNAME }}
           DATABASE_PASS=${{ env.DATABASE_PASSWORD }}
+          BUCKET_URL=${{ env.BUCKET_URL }}
+          BUCKET_NAME=${{ env.BUCKET_NAME }}
+          BUCKET_ACCESS_KEY=${{ env.BUCKET_ACCESS_KEY }}
+          BUCKET_SECRET_KEY=${{ env.BUCKET_SECRET_KEY }}
         tags: loris-mri
         load: true
         cache-from: type=gha,scope=loris-mri
-        cache-to: type=gha,scope=loris-mri
+        cache-to: type=gha,mode=max,scope=loris-mri
+
+    # TODO: Move as much as possible of this in the MRI dockerfile
+    - name: Mount imaging files S3 bucket
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y s3fs fuse kmod
+        sudo modprobe fuse
+        sudo mkdir /data-imaging
+        touch .passwd-s3fs
+        chmod 600 .passwd-s3fs
+        echo ${{ env.BUCKET_ACCESS_KEY }}:${{ env.BUCKET_SECRET_KEY }} > .passwd-s3fs
+        sudo s3fs ${{ env.BUCKET_NAME }} /data-imaging -o passwd_file=.passwd-s3fs -o url=${{ env.BUCKET_URL }} -o use_path_request_style -o allow_other
 
     - name: Run integration tests
       run: docker compose --file ./test/docker-compose.yml run mri pytest python/tests/integration
diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -11,6 +11,8 @@ services:
       retries: 5
   mri:
     image: loris-mri
+    volumes:
+      - /data-imaging:/data-imaging
     depends_on:
       db:
         condition: service_healthy
diff --git a/test/mri.Dockerfile b/test/mri.Dockerfile
@@ -7,21 +7,14 @@ RUN apt-get update
 # Install utilities #
 #####################
 
-# Update the package list and install build-essential, checkinstall, and cmake
-# Install some general dependencies
-RUN apt-get install -y build-essential checkinstall cmake libzip-dev mariadb-client
-
-# Install Perl and update CPAN
-RUN apt-get install -y perl && \
-    cpan CPAN
+# Install the dependencies of LORIS-MRI
+RUN apt-get install -y build-essential checkinstall cmake dcmtk libzip-dev mariadb-client perl
 
 # Install utilities
-# - `wget` is used by some installation commands
 # - `sudo` is used by the imaging install script
-RUN apt-get install -y wget sudo
-
-# Install the DICOM Toolkit
-RUN apt-get install -y dcmtk
+# - `s3fs` is used to mount the imaging files on the file system
+# - `wget` is used by some installation commands
+RUN apt-get install -y sudo wget
 
 ########################
 # Install MINC Toolkit #
@@ -70,7 +63,8 @@ RUN dpkg -i /tmp/bic-mni-models-0.1.1-20120421.deb && \
 RUN apt-get install -y libmariadb-dev libmariadb-dev-compat
 
 # Install the Perl libraries
-RUN cpan install Math::Round && \
+RUN cpan CPAN && \
+    cpan install Math::Round && \
     cpan install DBI && \
     cpan install DBD::mysql@4.052 && \
     cpan install Getopt::Tabular && \
@@ -117,3 +111,10 @@ ENV LORIS_MRI=/opt/${PROJECT}/bin/mri
 ENV PYTHONPATH=$PYTHONPATH:/opt/${PROJECT}/bin/mri/python:/opt/${PROJECT}/bin/mri/python/react-series-data-viewer
 ENV BEASTLIB=${MINC_TOOLKIT_DIR}/../share/beast-library-1.1
 ENV MNI_MODELS=${MINC_TOOLKIT_DIR}/../share/icbm152_model_09c
+
+#######################
+# Mount imaging files #
+#######################
+
+# TODO: Move mount logic from GitHub action to here.
+ENTRYPOINT ls /data-imaging