remove manylinux2010 and manylinux1 images

remove manylinux2010 and manylinux1 images

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.github/workflows/main.yml

@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, linux-riscv64, linux-riscv32, linux-m68k-uclibc]
+        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86, linux-riscv64, linux-riscv32, linux-m68k-uclibc]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2

Makefile

@@ -9,19 +9,19 @@ DOCKER = docker
 # Docker organization to pull the images from
 ORG = dockcross
 
-# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux1-x64)
+# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64)
 BIN = ./bin
 
 # These images are built using the "build implicit rule"
 STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-x64-clang linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-riscv64 linux-riscv32 linux-m68k-uclibc
 
 # Generated Dockerfiles.
-GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le linux-riscv64 linux-riscv32 linux-m68k-uclibc
+GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-x64-clang manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le linux-riscv64 linux-riscv32 linux-m68k-uclibc
 
 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
 
 # These images are expected to have explicit rules for *both* build and testing
-NON_STANDARD_IMAGES = web-wasm manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64
+NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64
 
 # Docker composite files
 DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross common.label-and-env
@@ -158,85 +158,6 @@ manylinux2014-x86.test: manylinux2014-x86
 	$(DOCKER) run $(RM) $(ORG)/manylinux2014-x86 > $(BIN)/dockcross-manylinux2014-x86 && chmod +x $(BIN)/dockcross-manylinux2014-x86
 	$(BIN)/dockcross-manylinux2014-x86 /opt/python/cp38-cp38/bin/python test/run.py
 
-#
-# manylinux2010-x64
-#
-
-manylinux2010-x64: manylinux2010-x64/Dockerfile
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \
-		-t $(ORG)/manylinux2010-x64:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		-f manylinux2010-x64/Dockerfile .
-	rm -rf $@/imagefiles
-
-manylinux2010-x64.test: manylinux2010-x64
-	$(DOCKER) run $(RM) dockcross/manylinux2010-x64 > $(BIN)/dockcross-manylinux2010-x64 && chmod +x $(BIN)/dockcross-manylinux2010-x64
-	$(BIN)/dockcross-manylinux2010-x64 /opt/python/cp38-cp38/bin/python test/run.py
-
-#
-# manylinux2010-x86
-#
-
-manylinux2010-x86: manylinux2010-x86/Dockerfile
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \
-		-t $(ORG)/manylinux2010-x86:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		-f manylinux2010-x86/Dockerfile .
-	rm -rf $@/imagefiles
-
-manylinux2010-x86.test: manylinux2010-x86
-	$(DOCKER) run $(RM) $(ORG)/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 && chmod +x $(BIN)/dockcross-manylinux2010-x86
-	$(BIN)/dockcross-manylinux2010-x86 /opt/python/cp38-cp38/bin/python test/run.py
-
-#
-# manylinux1-x64
-#
-
-manylinux1-x64: manylinux1-x64/Dockerfile
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux1-x64:latest \
-		-t $(ORG)/manylinux1-x64:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux1-x64 \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		-f manylinux1-x64/Dockerfile .
-	rm -rf $@/imagefiles
-
-manylinux1-x64.test: manylinux1-x64
-	$(DOCKER) run $(RM) $(ORG)/manylinux1-x64 > $(BIN)/dockcross-manylinux1-x64 && chmod +x $(BIN)/dockcross-manylinux1-x64
-	$(BIN)/dockcross-manylinux1-x64 /opt/python/cp38-cp38/bin/python test/run.py
-
-#
-# manylinux1-x86
-#
-
-manylinux1-x86: manylinux1-x86/Dockerfile
-	mkdir -p $@/imagefiles && cp -r imagefiles $@/
-	$(DOCKER) build -t $(ORG)/manylinux1-x86:latest \
-		-t $(ORG)/manylinux1-x86:$(TAG) \
-		--build-arg IMAGE=$(ORG)/manylinux1-x86 \
-		--build-arg VCS_REF=`git rev-parse --short HEAD` \
-		--build-arg VCS_URL=`git config --get remote.origin.url` \
-		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-		-f manylinux1-x86/Dockerfile .
-	rm -rf $@/imagefiles
-
-manylinux1-x86.test: manylinux1-x86
-	$(DOCKER) run $(RM) $(ORG)/manylinux1-x86 > $(BIN)/dockcross-manylinux1-x86 && chmod +x $(BIN)/dockcross-manylinux1-x86
-	$(BIN)/dockcross-manylinux1-x86 /opt/python/cp38-cp38/bin/python test/run.py
-
-#
-# base
-#
 
 base: Dockerfile imagefiles/
 	$(DOCKER) build -t $(ORG)/base:latest \

README.md

@@ -280,54 +280,6 @@ has installations of CMake, Ninja, and
 [scikit-build](http://scikit-build.org). For CMake, it sets
 [MANYLINUX2014]{.title-ref} to \"TRUE\" in the toolchain.
 
-### dockcross/manylinux2010-x64
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2010-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux2010-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2010-x64)
-
-Docker [manylinux2010](https://github.com/pypa/manylinux)
-image for building Linux x86_64 / amd64 [Python wheel
-packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
-3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
-and it has installations of CMake, Ninja, and
-[scikit-build](http://scikit-build.org). For CMake, it sets
-[MANYLINUX2010]{.title-ref} to \"TRUE\" in the toolchain.
-
-### dockcross/manylinux2010-x86
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2010-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux2010-x86/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2010-x86)
-
-Docker [manylinux2010](https://github.com/pypa/manylinux) image for
-building Linux i686 [Python wheel
-packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
-3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
-and it has installations of CMake, Ninja, and
-[scikit-build](http://scikit-build.org). For CMake, it sets
-[MANYLINUX2010]{.title-ref} to \"TRUE\" in the toolchain.
-
-### dockcross/manylinux1-x64
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux1-x64/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux1-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux1-x64)
-
-Docker [manylinux1](https://github.com/pypa/manylinux/tree/manylinux1)
-image for building Linux x86_64 / amd64 [Python wheel
-packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
-3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
-and it has installations of CMake, Ninja, and
-[scikit-build](http://scikit-build.org). For CMake, it sets
-[MANYLINUX1]{.title-ref} to \"TRUE\" in the toolchain.
-
-### dockcross/manylinux1-x86
-
-![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux1-x86/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/manylinux1-x86/latest)  ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux1-x86)
-
-Docker [manylinux1](https://github.com/pypa/manylinux/tree/manylinux1)
-image for building Linux i686 [Python wheel
-packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
-3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
-and it has installations of CMake, Ninja, and
-[scikit-build](http://scikit-build.org). For CMake, it sets
-[MANYLINUX1]{.title-ref} to \"TRUE\" in the toolchain.
-
 ### dockcross/web-wasm
 
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/web-wasm/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/web-wasm/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/web-wasm)

common/common.docker

@@ -18,7 +18,7 @@ COPY \
   /buildscripts/
 
 RUN \
-  X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux1-x86" -o "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2010-x86" -o "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "-32" || echo "") && \
+  X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "-32" || echo "") && \
   /buildscripts/build-and-install-openssl.sh $X86_FLAG && \
   /buildscripts/build-and-install-openssh.sh && \
   /buildscripts/build-and-install-curl.sh && \

manylinux1-x64/Dockerfile.in

@@ -1,28 +0,0 @@
-FROM quay.io/pypa/manylinux1_x86_64:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64
-ENV CMAKE_BIN true
-
-#include "common.manylinux"
-
-#include "common.dockcross"
-
-#include "common.docker"
-
-ENV CROSS_TRIPLE x86_64-linux-gnu
-ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin
-ENV AS=${CROSS_ROOT}/as \
-    AR=${CROSS_ROOT}/ar \
-    CC=${CROSS_ROOT}/gcc \
-    CPP=${CROSS_ROOT}/cpp \
-    CXX=${CROSS_ROOT}/g++ \
-    LD=${CROSS_ROOT}/ld \
-    FC=${CROSS_ROOT}/gfortran
-
-COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
-
-COPY manylinux1-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
-
-#include "common.label-and-env"

manylinux1-x64/Toolchain.cmake

@@ -1,11 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_CROSSCOMPILING FALSE)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR x86_64)
-
-set(MANYLINUX1 TRUE)
-
-set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc)
-set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++)
-set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran)

manylinux1-x86/Dockerfile.in

@@ -1,31 +0,0 @@
-FROM quay.io/pypa/manylinux1_i686:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86
-ENV CMAKE_BIN true
-
-#include "common.manylinux"
-
-#include "common.dockcross"
-
-#include "common.docker"
-
-ENV CROSS_TRIPLE i686-linux-gnu
-ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin
-ENV AS=${CROSS_ROOT}/as \
-    AR=${CROSS_ROOT}/ar \
-    CC=${CROSS_ROOT}/gcc \
-    CPP=${CROSS_ROOT}/cpp \
-    CXX=${CROSS_ROOT}/g++ \
-    LD=${CROSS_ROOT}/ld \
-    FC=${CROSS_ROOT}/gfortran
-
-COPY linux-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
-
-COPY manylinux1-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
-
-COPY linux-x86/linux32-entrypoint.sh /dockcross/
-ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
-
-#include "common.label-and-env"

manylinux1-x86/Toolchain.cmake

@@ -1,15 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_CROSSCOMPILING FALSE)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR i686)
-
-set(MANYLINUX1 TRUE)
-
-set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc)
-set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++)
-set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran)
-
-# Discard path returned by pkg-config and associated with HINTS in module
-# like FindOpenSSL.
-set(CMAKE_IGNORE_PATH /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/lib/)

manylinux2010-x64/Dockerfile.in

@@ -1,32 +0,0 @@
-FROM quay.io/pypa/manylinux2010_x86_64:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x64
-
-#include "common.manylinux"
-
-#include "common.dockcross"
-
-#include "common.docker"
-
-# Override yum to work around the problem with newly built libcurl.so.4
-# https://access.redhat.com/solutions/641093
-RUN echo $'#!/bin/bash\n\
-LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
-
-ENV CROSS_TRIPLE x86_64-linux-gnu
-ENV CROSS_ROOT /opt/rh/devtoolset-8/root/usr/bin
-ENV AS=${CROSS_ROOT}/as \
-    AR=${CROSS_ROOT}/ar \
-    CC=${CROSS_ROOT}/gcc \
-    CPP=${CROSS_ROOT}/cpp \
-    CXX=${CROSS_ROOT}/g++ \
-    LD=${CROSS_ROOT}/ld \
-    FC=${CROSS_ROOT}/gfortran
-
-COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
-
-COPY manylinux2010-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
-
-#include "common.label-and-env"

manylinux2010-x64/Toolchain.cmake

@@ -1,11 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_CROSSCOMPILING FALSE)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR x86_64)
-
-set(MANYLINUX2010 TRUE)
-
-set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc)
-set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-8/root/usr/bin/g++)
-set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gfortran)

manylinux2010-x86/Dockerfile.in

@@ -1,35 +0,0 @@
-FROM quay.io/pypa/manylinux2010_i686:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x86
-
-#include "common.manylinux"
-
-#include "common.dockcross"
-
-#include "common.docker"
-
-# Override yum to work around the problem with newly built libcurl.so.4
-# https://access.redhat.com/solutions/641093
-RUN echo $'#!/bin/bash\n\
-LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
-
-ENV CROSS_TRIPLE i686-linux-gnu
-ENV CROSS_ROOT /opt/rh/devtoolset-8/root/usr/bin
-ENV AS=${CROSS_ROOT}/as \
-    AR=${CROSS_ROOT}/ar \
-    CC=${CROSS_ROOT}/gcc \
-    CPP=${CROSS_ROOT}/cpp \
-    CXX=${CROSS_ROOT}/g++ \
-    LD=${CROSS_ROOT}/ld \
-    FC=${CROSS_ROOT}/gfortran
-
-COPY linux-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
-
-COPY manylinux2010-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
-
-COPY linux-x86/linux32-entrypoint.sh /dockcross/
-ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
-
-#include "common.label-and-env"

manylinux2010-x86/Toolchain.cmake

@@ -1,11 +0,0 @@
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_CROSSCOMPILING FALSE)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR i686)
-
-set(MANYLINUX2010 TRUE)
-
-set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc)
-set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-8/root/usr/bin/g++)
-set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gfortran)