From c818d7d998b85d01db116359311774435d4f94ea Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Fri, 17 Sep 2021 11:35:05 -0400 Subject: [PATCH 1/2] Use manylinux2010's cmake version The base docker image contains an up todate cmake installation. The SimpleITK build has been using this and not the custom installed version. --- Utilities/Distribution/manylinux/Dockerfile-2010-x86_64 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Utilities/Distribution/manylinux/Dockerfile-2010-x86_64 b/Utilities/Distribution/manylinux/Dockerfile-2010-x86_64 index e6c0a80a3d..4e954853de 100644 --- a/Utilities/Distribution/manylinux/Dockerfile-2010-x86_64 +++ b/Utilities/Distribution/manylinux/Dockerfile-2010-x86_64 @@ -1,12 +1,7 @@ FROM quay.io/pypa/manylinux2010_x86_64 MAINTAINER Insight Software Consortium -ADD https://github.com/Kitware/CMake/releases/download/v3.13.5/cmake-3.13.5-Linux-x86_64.sh \ - /tmp/ - WORKDIR /tmp/ -RUN yum remove cmake -y -RUN sh cmake-3.13.5-Linux-x86_64.sh --prefix=/usr --skip-license && rm -rf /tmp/* # User is expected to mount directory to "/work" ENTRYPOINT ["bash", "-c", "/work/io/imagefiles/cmd.sh" ] From cf96b90705ce8f199f8efc7ac44c812d2446513e Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Fri, 17 Sep 2021 11:36:46 -0400 Subject: [PATCH 2/2] Remove old manylinux1 builds The manylinux1 base images are based on the old centos 5. We are unable to install the CMake >=3.16.5 version for ITK 5.3. --- Testing/CI/Azure/azure-pipelines-package.yml | 3 --- Utilities/Distribution/manylinux/Dockerfile-i686 | 13 ------------- Utilities/Distribution/manylinux/Dockerfile-x86_64 | 13 ------------- 3 files changed, 29 deletions(-) delete mode 100644 Utilities/Distribution/manylinux/Dockerfile-i686 delete mode 100644 Utilities/Distribution/manylinux/Dockerfile-x86_64 diff --git a/Testing/CI/Azure/azure-pipelines-package.yml b/Testing/CI/Azure/azure-pipelines-package.yml index a3830fc5b2..99ff07bc38 100644 --- a/Testing/CI/Azure/azure-pipelines-package.yml +++ b/Testing/CI/Azure/azure-pipelines-package.yml @@ -24,9 +24,6 @@ jobs: - template: templates/package-linux-job.yml parameters: DOCKERFILE: Dockerfile-2010-x86_64 - - template: templates/package-linux-job.yml - parameters: - DOCKERFILE: Dockerfile-x86_64 - template: templates/package-mac-job.yml - template: templates/package-win-job.yml parameters: diff --git a/Utilities/Distribution/manylinux/Dockerfile-i686 b/Utilities/Distribution/manylinux/Dockerfile-i686 deleted file mode 100644 index bf36542ee8..0000000000 --- a/Utilities/Distribution/manylinux/Dockerfile-i686 +++ /dev/null @@ -1,13 +0,0 @@ -FROM quay.io/pypa/manylinux1_i686 -MAINTAINER Insight Software Consortium - -ADD https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz \ - https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz \ - /tmp/ - -WORKDIR /tmp/ -COPY ./imagefiles/install.sh ./ -RUN /usr/bin/linux32 bash -v install.sh && rm -rf /tmp/* - -# User is expected to mount directory to "/work" -ENTRYPOINT [ "/usr/bin/linux32", "bash", "-c", "groupadd -o -g $_GROUPID $_USER && useradd -m -o -g $_GROUPID $_USER -u $_USERID && su $_USER /work/io/imagefiles/cmd.sh" ] diff --git a/Utilities/Distribution/manylinux/Dockerfile-x86_64 b/Utilities/Distribution/manylinux/Dockerfile-x86_64 deleted file mode 100644 index 74d19ae898..0000000000 --- a/Utilities/Distribution/manylinux/Dockerfile-x86_64 +++ /dev/null @@ -1,13 +0,0 @@ -FROM quay.io/pypa/manylinux1_x86_64 -MAINTAINER Insight Software Consortium - -ADD https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz \ - https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz \ - /tmp/ - -WORKDIR /tmp/ -COPY ./imagefiles/install.sh ./ -RUN bash -v install.sh && rm -rf /tmp/* - -# User is expected to mount directory to "/work" -ENTRYPOINT ["bash", "-c", "/work/io/imagefiles/cmd.sh" ]