Skip to content

Commit 3dfc7b3

Browse files
authored
[MAINT] remove freesurfer from Dockerfile (#106)
* remove freesurfer from Dockerfile * bump the version for the docker cache * remove check for freesurfer
1 parent 1ddc7a6 commit 3dfc7b3

File tree

3 files changed

+5
-43
lines changed

3 files changed

+5
-43
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
apk add --no-cache pigz python3
1313
- restore_cache:
1414
keys:
15-
- docker-v1-{{ .Branch }}-{{ epoch }}
16-
- docker-v1-{{ .Branch }}-
17-
- docker-v1-master-
18-
- docker-v1-
15+
- docker-v2-{{ .Branch }}-{{ epoch }}
16+
- docker-v2-{{ .Branch }}-
17+
- docker-v2-master-
18+
- docker-v2-
1919
paths:
2020
- /tmp/cache/docker.tar.gz
2121
- checkout
@@ -56,7 +56,7 @@ jobs:
5656
- cache/docker.tar.gz
5757
- src/RestingState
5858
- save_cache:
59-
key: docker-v1-{{ .Branch }}-{{ epoch }}
59+
key: docker-v2-{{ .Branch }}-{{ epoch }}
6060
paths:
6161
- /tmp/cache/docker.tar.gz
6262

Dockerfile

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,6 @@ RUN apt-get update -qq && apt-get install -yq --no-install-recommends \
3636
fsl \
3737
fsl-atlases
3838

39-
# Installing freesurfer
40-
RUN curl -sSL https://surfer.nmr.mgh.harvard.edu/pub/dist/freesurfer/6.0.1/freesurfer-Linux-centos6_x86_64-stable-pub-v6.0.1.tar.gz | tar zxv --no-same-owner -C /opt \
41-
--exclude='freesurfer/diffusion' \
42-
--exclude='freesurfer/docs' \
43-
--exclude='freesurfer/fsfast' \
44-
--exclude='freesurfer/lib/cuda' \
45-
--exclude='freesurfer/lib/qt' \
46-
--exclude='freesurfer/matlab' \
47-
--exclude='freesurfer/mni/share/man' \
48-
--exclude='freesurfer/subjects/fsaverage_sym' \
49-
--exclude='freesurfer/subjects/fsaverage3' \
50-
--exclude='freesurfer/subjects/fsaverage4' \
51-
--exclude='freesurfer/subjects/cvs_avg35' \
52-
--exclude='freesurfer/subjects/cvs_avg35_inMNI152' \
53-
--exclude='freesurfer/subjects/bert' \
54-
--exclude='freesurfer/subjects/lh.EC_average' \
55-
--exclude='freesurfer/subjects/rh.EC_average' \
56-
--exclude='freesurfer/subjects/sample-*.mgz' \
57-
--exclude='freesurfer/subjects/V1_average' \
58-
--exclude='freesurfer/trctrain'
59-
6039
# Installing and setting up miniconda
6140
RUN curl -sSLO https://repo.anaconda.com/miniconda/Miniconda2-latest-Linux-x86_64.sh && \
6241
bash Miniconda2-latest-Linux-x86_64.sh -b -p /usr/local/miniconda && \
@@ -99,19 +78,8 @@ ENV FSLDIR=/usr/share/fsl/5.0 \
9978
LD_LIBRARY_PATH=/usr/lib/fsl/5.0:$LD_LIBRARY_PATH \
10079
FSLTCLSH=/usr/bin/tclsh \
10180
FSLWISH=/usr/bin/wish \
102-
FSF_OUTPUT_FORMAT="nii.gz" \
103-
FREESURFER_HOME="/opt/freesurfer" \
10481
PATH="/opt/ICA-AROMA:/opt/RestingState:/usr/lib/afni/bin/:/usr/lib/fsl/5.0:$PATH"
10582

106-
ENV SUBJECTS_DIR="$FREESURFER_HOME/subjects" \
107-
FUNCTIONALS_DIR="$FREESURFER_HOME/sessions" \
108-
MNI_DIR="$FREESURFER_HOME/mni" \
109-
LOCAL_DIR="$FREESURFER_HOME/local" \
110-
MINC_BIN_DIR="$FREESURFER_HOME/mni/bin" \
111-
MINC_LIB_DIR="$FREESURFER_HOME/mni/lib" \
112-
MNI_DATAPATH="$FREESURFER_HOME/mni/data" \
113-
PATH="$FREESURFER_HOME/bin:$FSFAST_HOME/bin:$FREESURFER_HOME/tktools:$PATH"
114-
11583
# clean up
11684
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
11785

processRestingState_bids_wrapper.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,6 @@ function softwareCheck()
5252
echo "fsl is either not downloaded or not defined in your path, exiting script"
5353
exit 1
5454
fi
55-
56-
if [ "$(which freesurfer)" == "" ]; then
57-
echo "freesurfer is either not downloaded or not defined in your path, exiting script"
58-
exit 1
59-
fi
60-
6155
}
6256

6357
function clobber()

0 commit comments

Comments
 (0)