@@ -12,9 +12,6 @@ parameters:
1212 type : boolean
1313 default : false
1414
15- orbs :
16- singularity :
singularity/[email protected] 17-
1815commands :
1916 push-to-docker-hub :
2017 parameters :
@@ -71,6 +68,42 @@ commands:
7168 - run :
7269 name : Getting Sample BIDS Data
7370 command : git clone https://github.com/bids-standard/bids-examples.git
71+ get-singularity :
72+ parameters :
73+ version :
74+ description : " Version of Singularity to clone"
75+ type : string
76+ default : v3.8.7
77+ steps :
78+ - install-singularity-requirements
79+ - restore_cache :
80+ keys :
81+ - singularity-<< parameters.version >>
82+ - run :
83+ name : " Cloning Singularity << parameters.version >>"
84+ command : |
85+ if [[ ! -d singularity-<< parameters.version >> ]]
86+ then
87+ git clone -b << parameters.version >> https://github.com/apptainer/singularity singularity-<< parameters.version >>
88+ fi
89+ - save_cache :
90+ key : singularity-<< parameters.version >>
91+ paths :
92+ - singularity-<< parameters.version >>
93+ - run :
94+ name : " Setting up Singularity"
95+ command : |
96+ cd singularity-<< parameters.version >>
97+ ./mconfig
98+ make -C builddir
99+ sudo make -C builddir install
100+ cd ..
101+ install-singularity-requirements :
102+ steps :
103+ - run :
104+ name : " Installing Singularity requirements"
105+ command : |
106+ sudo apt-get update && sudo apt-get install flawfinder squashfs-tools uuid-dev libuuid1 libffi-dev libssl-dev libssl1.1 libarchive-dev libgpgme11-dev libseccomp-dev -y
74107 run-pytest-docker :
75108 steps :
76109 - create-docker-test-container :
@@ -206,9 +239,11 @@ jobs:
206239 - set-up-variant :
207240 variant : " << parameters.variant >>"
208241 - set-python-version
209- - singularity/build_container_docker_base :
210- from-uri : docker://${DOCKER_TAG}
211- image : cpac-singularity-image${VARIANT}.sif
242+ - get-singularity
243+ - run :
244+ command : singularity pull cpac-singularity-image${VARIANT}.sif docker://${DOCKER_TAG}
245+ name : " Pull Singularity image"
246+ no_output_timeout : 1h
212247 - test-singularity-installation
213248 - run :
214249 command : " SINGULARITYENV_COVERAGE_FILE=.coverage.singularity${VARIANT} singularity exec -B $PWD:/code cpac-singularity-image${VARIANT}.sif /code/dev/circleci_data/test_in_image.sh"
0 commit comments