diff --git a/.circleci/config.yml b/.circleci/config.yml index 2932703..be17677 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,39 +3,6 @@ build-settings: &build-settings version: 2 jobs: - itk-v4.8.0_use_system_libraries-off: - <<: *build-settings - docker: - - image: slicer/slicerexecutionmodel:${CIRCLE_JOB} - steps: - - checkout - - run: - command: ./test/Docker/test.sh ${CIRCLE_JOB} - - # ITK v4.10.1 - itk-v4.10.1_use_system_libraries-off: - <<: *build-settings - docker: - - image: slicer/slicerexecutionmodel:${CIRCLE_JOB} - steps: - - checkout - - run: - command: ./test/Docker/test.sh ${CIRCLE_JOB} - - run: - command: ./test/Docker/test-serializer.sh ${CIRCLE_JOB} - - # ITK v4.13.0 - itk-v4.13.0_use_system_libraries-off: - <<: *build-settings - docker: - - image: slicer/slicerexecutionmodel:${CIRCLE_JOB} - steps: - - checkout - - run: - command: ./test/Docker/test.sh ${CIRCLE_JOB} - - run: - command: ./test/Docker/test-serializer.sh ${CIRCLE_JOB} - # ITK master itk-master_use_system_libraries-off: @@ -53,7 +20,4 @@ workflows: version: 2 build-test: jobs: - - itk-v4.8.0_use_system_libraries-off - - itk-v4.10.1_use_system_libraries-off - - itk-v4.13.0_use_system_libraries-off - itk-master_use_system_libraries-off diff --git a/README.md b/README.md index 0fb3ea6..ff79ec2 100644 --- a/README.md +++ b/README.md @@ -81,12 +81,20 @@ environment is made available in docker images: * Testing using a given environment is enabled updating the [.circleci/config.yml](.circleci/config.yml) file. * Before enabling an environment, associated docker image has to be (1) built locally and (2) pushed to [dockerhub](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags/). -Available environments are: +#### Available environments -* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-v4.8.0_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-v4.8.0_use_system_libraries-off) -* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-v4.10.1_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-v4.10.1_use_system_libraries-off) -* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-v4.13.0_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-v4.13.0_use_system_libraries-off) -* [![](https://images.microbadger.com/badges/version/slicer/slicerexecutionmodel:itk-master_use_system_libraries-off.svg)](https://microbadger.com/images/slicer/slicerexecutionmodel:itk-master_use_system_libraries-off) +* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-master_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-master_use_system_libraries-off) + + +#### Deprecated environments + +_Deprecated environments are not maintained, corresponding Dockerfiles have been deleted and associated SlicerExecutionModel continuous integration settings have been removed._ + +* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-v4.8.0_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-v4.8.0_use_system_libraries-off) + +* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-v4.10.1_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-v4.10.1_use_system_libraries-off) + +* [![](https://img.shields.io/docker/image-size/slicer/slicerexecutionmodel/itk-v4.13.0_use_system_libraries-off)](https://hub.docker.com/r/slicer/slicerexecutionmodel/tags?page=1&name=itk-v4.13.0_use_system_libraries-off) ### Adding or updating a testing environment diff --git a/test/Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF/Dockerfile b/test/Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF/Dockerfile index 42f82a6..858d588 100644 --- a/test/Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF/Dockerfile +++ b/test/Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF/Dockerfile @@ -3,8 +3,9 @@ MAINTAINER Insight Software Consortium WORKDIR /usr/src -# March 15, 2020 -ENV ITK_GIT_COMMIT d67ae984a703a71b2d8d6932216561157b322c28 +# February 10, 2022 +# - master (d6774dac0) of 2022-02-07 and changes from https://github.com/InsightSoftwareConsortium/ITK/pull/3187 +ENV ITK_GIT_COMMIT 060131b628e9a2d3f4613adc077ac04dd1a4ea7b RUN \ # @@ -14,7 +15,7 @@ RUN \ # # Checkout # - git clone git://github.com/InsightSoftwareConsortium/ITK ITK && \ + git clone git://github.com/jcfr/ITK ITK && \ cd ITK && git reset --hard ${ITK_GIT_COMMIT} && \ # # Configure diff --git a/test/Docker-ITK-v4.10.1_USE_SYSTEM_LIBRARIES-OFF/Dockerfile b/test/Docker-ITK-v4.10.1_USE_SYSTEM_LIBRARIES-OFF/Dockerfile deleted file mode 100644 index 875c61c..0000000 --- a/test/Docker-ITK-v4.10.1_USE_SYSTEM_LIBRARIES-OFF/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -FROM dockbuild/centos7 -MAINTAINER Insight Software Consortium - -WORKDIR /usr/src - -ENV ITK_GIT_TAG v4.10.1 - -RUN \ - # - # Settings - # - working_dir=$(pwd) && \ - # - # Checkout - # - git clone git://github.com/InsightSoftwareConsortium/ITK --single-branch -b ${ITK_GIT_TAG} ITK && \ - # - # Configure - # - cd $working_dir && \ - mkdir ITK-build && cd $_ && \ - cmake \ - -G Ninja \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DBUILD_EXAMPLES:BOOL=OFF \ - -DBUILD_TESTING:BOOL=OFF \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \ - -DITK_LEGACY_REMOVE:BOOL=ON \ - -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF \ - -DITK_USE_SYSTEM_LIBRARIES:BOOL=OFF \ - -DModule_ITKCommon:BOOL=ON \ - -DModule_ITKIOXML:BOOL=ON \ - -DModule_ITKExpat:BOOL=ON \ - ../ITK && \ - # - # Build and install - # - ninja install && \ - # - # Cleanup - # - rm -rf $working_dir/ITK $working_dir/ITK-build - -# Build-time metadata as defined at http://label-schema.org -ARG BUILD_DATE -ARG IMAGE -ARG VCS_REF -ARG VCS_URL -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name=$IMAGE \ - org.label-schema.description="An open-source CMake-based project that provides macros and associated tools for the easy building of 3D Slicer command line interface (CLI) modules." \ - org.label-schema.url="http://www.slicer.org" \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url=$VCS_URL \ - org.label-schema.schema-version="1.0" diff --git a/test/Docker-ITK-v4.13.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile b/test/Docker-ITK-v4.13.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile deleted file mode 100644 index 6ab5f10..0000000 --- a/test/Docker-ITK-v4.13.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -FROM dockbuild/centos7 -MAINTAINER Insight Software Consortium - -WORKDIR /usr/src - -ENV ITK_GIT_TAG v4.13.0 - -RUN \ - # - # Settings - # - working_dir=$(pwd) && \ - # - # Checkout - # - git clone git://github.com/InsightSoftwareConsortium/ITK --single-branch -b ${ITK_GIT_TAG} ITK && \ - # - # Configure - # - cd $working_dir && \ - mkdir ITK-build && cd $_ && \ - cmake \ - -G Ninja \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DBUILD_EXAMPLES:BOOL=OFF \ - -DBUILD_TESTING:BOOL=OFF \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \ - -DITK_LEGACY_REMOVE:BOOL=ON \ - -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF \ - -DITK_USE_SYSTEM_LIBRARIES:BOOL=OFF \ - -DModule_ITKCommon:BOOL=ON \ - -DModule_ITKIOXML:BOOL=ON \ - -DModule_ITKExpat:BOOL=ON \ - ../ITK && \ - # - # Build and install - # - ninja install && \ - # - # Cleanup - # - rm -rf $working_dir/ITK $working_dir/ITK-build - -# Build-time metadata as defined at http://label-schema.org -ARG BUILD_DATE -ARG IMAGE -ARG VCS_REF -ARG VCS_URL -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name=$IMAGE \ - org.label-schema.description="An open-source CMake-based project that provides macros and associated tools for the easy building of 3D Slicer command line interface (CLI) modules." \ - org.label-schema.url="http://www.slicer.org" \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url=$VCS_URL \ - org.label-schema.schema-version="1.0" diff --git a/test/Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile b/test/Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile deleted file mode 100644 index b450274..0000000 --- a/test/Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -FROM dockbuild/centos7 -MAINTAINER Insight Software Consortium - -WORKDIR /usr/src - -ENV ITK_GIT_TAG v4.8.0 - -RUN \ - # - # Settings - # - working_dir=$(pwd) && \ - # - # Checkout - # - git clone git://github.com/InsightSoftwareConsortium/ITK --single-branch -b ${ITK_GIT_TAG} ITK && \ - # - # Configure - # - cd $working_dir && \ - mkdir ITK-build && cd $_ && \ - cmake \ - -G Ninja \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DBUILD_EXAMPLES:BOOL=OFF \ - -DBUILD_TESTING:BOOL=OFF \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \ - -DITK_LEGACY_REMOVE:BOOL=ON \ - -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF \ - -DITK_USE_SYSTEM_LIBRARIES:BOOL=OFF \ - -DModule_ITKCommon:BOOL=ON \ - -DModule_ITKIOXML:BOOL=ON \ - -DModule_ITKExpat:BOOL=ON \ - ../ITK && \ - # - # Build and install - # - ninja install && \ - # - # Cleanup - # - rm -rf $working_dir/ITK $working_dir/ITK-build - -# Build-time metadata as defined at http://label-schema.org -ARG BUILD_DATE -ARG IMAGE -ARG VCS_REF -ARG VCS_URL -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.name=$IMAGE \ - org.label-schema.description="An open-source CMake-based project that provides macros and associated tools for the easy building of 3D Slicer command line interface (CLI) modules." \ - org.label-schema.url="http://www.slicer.org" \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url=$VCS_URL \ - org.label-schema.schema-version="1.0" diff --git a/test/Docker/Makefile b/test/Docker/Makefile index d08e516..a0accb3 100644 --- a/test/Docker/Makefile +++ b/test/Docker/Makefile @@ -10,10 +10,7 @@ ORG = slicer REPO = slicerexecutionmodel DIRECTORIES = \ - Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF \ - Docker-ITK-v4.13.0_USE_SYSTEM_LIBRARIES-OFF \ - Docker-ITK-v4.10.1_USE_SYSTEM_LIBRARIES-OFF \ - Docker-ITK-v4.8.0_USE_SYSTEM_LIBRARIES-OFF + Docker-ITK-master_USE_SYSTEM_LIBRARIES-OFF # On CircleCI, do not attempt to delete container # See https://circleci.com/docs/docker-btrfs-error/