make sure we have a clean working tree

cpp-lln-lab · Aug 17, 2024 · 85dbb14 · 85dbb14
1 parent d048de0
commit 85dbb14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -57,11 +57,15 @@ WORKDIR /home/neuro
 COPY . /home/neuro/bidspm
 WORKDIR /home/neuro/bidspm
 RUN git restore . && \
+    git -C lib/CPP_ROI/atlas/HCPex reset --hard && \
+    git -C lib/CPP_ROI/atlas/HCPex clean --force -dfx && \
     pip install --no-cache-dir --upgrade pip && \
     pip3 --no-cache-dir install -r requirements.txt && \
     pip3 --no-cache-dir install . && \
-    octave --no-gui --eval "addpath('/opt/spm12/'); savepath ();" && \
-    octave --no-gui --eval "addpath(pwd); savepath(); bidspm(); path"
+    octave --no-gui --eval "addpath('/opt/spm12/'); savepath ('/usr/share/octave/site/m/startup/octaverc');" && \
+    octave --no-gui --eval "addpath(pwd); savepath('/usr/share/octave/site/m/startup/octaverc'); bidspm(); path" && \
+    octave --no-gui --eval "path"
+
 
 WORKDIR /home/neuro
 

diff --git a/bidspm.def b/bidspm.def
@@ -51,12 +51,15 @@ From: bids/base_validator:1.13.1
     ln -s /opt/spm12/bin/spm12-octave /usr/local/bin/spm12
 
     git -C /opt/bidspm restore .
+    git -C /opt/bidspm/lib/CPP_ROI/atlas/HCPex reset --hard
+    git -C /opt/bidspm/lib/CPP_ROI/atlas/HCPex clean --force -dfx
 
     pip install --upgrade pip
     pip install -r /opt/bidspm/requirements.txt
     pip install /opt/bidspm
     octave --no-gui --eval "addpath('/opt/spm12/'); savepath ('/usr/share/octave/site/m/startup/octaverc');" && \
-    octave --no-gui --eval "addpath('/opt/bidspm/'); savepath('/usr/share/octave/site/m/startup/octaverc'); bidspm(); path"
+    octave --no-gui --eval "addpath('/opt/bidspm/'); savepath('/usr/share/octave/site/m/startup/octaverc'); bidspm(); path"  && \
+    octave --no-gui --eval "path"
 
 %runscript
     bidspm "$@"