diff --git a/Dockerfile b/Dockerfile index ed5f0b201..3961f230b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ # Start from the fredericklab base container -#FROM fredericklab/basecontainer:v0.2.8 -FROM fredericklab/basecontainer:latest +FROM fredericklab/basecontainer:v0.2.9.1 # get build arguments ARG BUILD_TIME diff --git a/testdocker.sh b/testdocker.sh index 89c12873a..fcb4c7830 100755 --- a/testdocker.sh +++ b/testdocker.sh @@ -19,48 +19,47 @@ docker run \ --nprocs 4 \ --noglm -docker run \ - --rm \ - --ipc host \ - --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \ - -it \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -u rapidtide fredericklab/rapidtide:latest \ - rapidtide \ - /data/src/sub-RAPIDTIDETEST.nii.gz \ - /data/dst/sub-RAPIDTIDETEST_disabledockermemfix \ - --disabledockermemfix \ - --passes 3 \ - --nprocs 4 \ - --noglm +#docker run \ +# --rm \ +# --ipc host \ +# --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \ +# -it \ +# -v /tmp/.X11-unix:/tmp/.X11-unix \ +# -u rapidtide fredericklab/rapidtide:latest \ +# rapidtide \ +# /data/src/sub-RAPIDTIDETEST.nii.gz \ +# /data/dst/sub-RAPIDTIDETEST_disabledockermemfix \ +# --disabledockermemfix \ +# --passes 3 \ +# --nprocs 4 \ +# --noglm -exit -docker run \ - --rm \ - --ipc host \ - --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \ - -it \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -u rapidtide fredericklab/rapidtide:latest \ - happy \ - /data/src/sub-HAPPYTEST.nii.gz \ - /data/src/sub-HAPPYTEST.json \ - /data/dst/sub-HAPPYTEST \ - --model model_revised \ - --mklthreads -1 +#docker run \ +# --rm \ +# --ipc host \ +# --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \ +# -it \ +# -v /tmp/.X11-unix:/tmp/.X11-unix \ +# -u rapidtide fredericklab/rapidtide:latest \ +# happy \ +# /data/src/sub-HAPPYTEST.nii.gz \ +# /data/src/sub-HAPPYTEST.json \ +# /data/dst/sub-HAPPYTEST \ +# --model model_revised \ +# --mklthreads -1 -docker run \ - --rm \ - --ipc host \ - --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \ - -it \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - -u rapidtide fredericklab/rapidtide:latest \ - gmscalc \ - /data/src/sub-RAPIDTIDETEST.nii.gz \ - /data/dst/sub-RAPIDTIDETEST_GMS \ - --dmask /data/src/sub-RAPIDTIDETEST_brainmask.nii.gz +#docker run \ +# --rm \ +# --ipc host \ +# --mount type=bind,source=/Users/frederic/code/rapidtide/rapidtide/data/examples,destination=/data \ +# -it \ +# -v /tmp/.X11-unix:/tmp/.X11-unix \ +# -u rapidtide fredericklab/rapidtide:latest \ +# gmscalc \ +# /data/src/sub-RAPIDTIDETEST.nii.gz \ +# /data/dst/sub-RAPIDTIDETEST_GMS \ +# --dmask /data/src/sub-RAPIDTIDETEST_brainmask.nii.gz docker run \ --network host\