Skip to content

Commit 54f73cb

Browse files
bensuperpcbensuperpc
committed
remove manylinux2010 and manylinux1 images
remove manylinux2010 and manylinux1 images Signed-off-by: Bensuperpc <[email protected]>
1 parent 53dbfc8 commit 54f73cb

12 files changed

Lines changed: 5 additions & 306 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
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]
49+
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]
5050
steps:
5151
- uses: actions/checkout@v2
5252
- uses: actions/download-artifact@v2

‎Makefile‎

Lines changed: 3 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ DOCKER = docker
99
# Docker organization to pull the images from
1010
ORG = dockcross
1111

12-
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux1-x64)
12+
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64)
1313
BIN = ./bin
1414

1515
# These images are built using the "build implicit rule"
1616
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
1717

1818
# Generated Dockerfiles.
19-
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
19+
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
2020

2121
GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
2222

2323
# These images are expected to have explicit rules for *both* build and testing
24-
NON_STANDARD_IMAGES = web-wasm manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64
24+
NON_STANDARD_IMAGES = web-wasm manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64
2525

2626
# Docker composite files
2727
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
158158
$(DOCKER) run $(RM) $(ORG)/manylinux2014-x86 > $(BIN)/dockcross-manylinux2014-x86 && chmod +x $(BIN)/dockcross-manylinux2014-x86
159159
$(BIN)/dockcross-manylinux2014-x86 /opt/python/cp38-cp38/bin/python test/run.py
160160

161-
#
162-
# manylinux2010-x64
163-
#
164-
165-
manylinux2010-x64: manylinux2010-x64/Dockerfile
166-
mkdir -p $@/imagefiles && cp -r imagefiles $@/
167-
$(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \
168-
-t $(ORG)/manylinux2010-x64:$(TAG) \
169-
--build-arg IMAGE=$(ORG)/manylinux2010-x64 \
170-
--build-arg VCS_REF=`git rev-parse --short HEAD` \
171-
--build-arg VCS_URL=`git config --get remote.origin.url` \
172-
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
173-
-f manylinux2010-x64/Dockerfile .
174-
rm -rf $@/imagefiles
175-
176-
manylinux2010-x64.test: manylinux2010-x64
177-
$(DOCKER) run $(RM) dockcross/manylinux2010-x64 > $(BIN)/dockcross-manylinux2010-x64 && chmod +x $(BIN)/dockcross-manylinux2010-x64
178-
$(BIN)/dockcross-manylinux2010-x64 /opt/python/cp38-cp38/bin/python test/run.py
179-
180-
#
181-
# manylinux2010-x86
182-
#
183-
184-
manylinux2010-x86: manylinux2010-x86/Dockerfile
185-
mkdir -p $@/imagefiles && cp -r imagefiles $@/
186-
$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \
187-
-t $(ORG)/manylinux2010-x86:$(TAG) \
188-
--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
189-
--build-arg VCS_REF=`git rev-parse --short HEAD` \
190-
--build-arg VCS_URL=`git config --get remote.origin.url` \
191-
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
192-
-f manylinux2010-x86/Dockerfile .
193-
rm -rf $@/imagefiles
194-
195-
manylinux2010-x86.test: manylinux2010-x86
196-
$(DOCKER) run $(RM) $(ORG)/manylinux2010-x86 > $(BIN)/dockcross-manylinux2010-x86 && chmod +x $(BIN)/dockcross-manylinux2010-x86
197-
$(BIN)/dockcross-manylinux2010-x86 /opt/python/cp38-cp38/bin/python test/run.py
198-
199-
#
200-
# manylinux1-x64
201-
#
202-
203-
manylinux1-x64: manylinux1-x64/Dockerfile
204-
mkdir -p $@/imagefiles && cp -r imagefiles $@/
205-
$(DOCKER) build -t $(ORG)/manylinux1-x64:latest \
206-
-t $(ORG)/manylinux1-x64:$(TAG) \
207-
--build-arg IMAGE=$(ORG)/manylinux1-x64 \
208-
--build-arg VCS_REF=`git rev-parse --short HEAD` \
209-
--build-arg VCS_URL=`git config --get remote.origin.url` \
210-
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
211-
-f manylinux1-x64/Dockerfile .
212-
rm -rf $@/imagefiles
213-
214-
manylinux1-x64.test: manylinux1-x64
215-
$(DOCKER) run $(RM) $(ORG)/manylinux1-x64 > $(BIN)/dockcross-manylinux1-x64 && chmod +x $(BIN)/dockcross-manylinux1-x64
216-
$(BIN)/dockcross-manylinux1-x64 /opt/python/cp38-cp38/bin/python test/run.py
217-
218-
#
219-
# manylinux1-x86
220-
#
221-
222-
manylinux1-x86: manylinux1-x86/Dockerfile
223-
mkdir -p $@/imagefiles && cp -r imagefiles $@/
224-
$(DOCKER) build -t $(ORG)/manylinux1-x86:latest \
225-
-t $(ORG)/manylinux1-x86:$(TAG) \
226-
--build-arg IMAGE=$(ORG)/manylinux1-x86 \
227-
--build-arg VCS_REF=`git rev-parse --short HEAD` \
228-
--build-arg VCS_URL=`git config --get remote.origin.url` \
229-
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
230-
-f manylinux1-x86/Dockerfile .
231-
rm -rf $@/imagefiles
232-
233-
manylinux1-x86.test: manylinux1-x86
234-
$(DOCKER) run $(RM) $(ORG)/manylinux1-x86 > $(BIN)/dockcross-manylinux1-x86 && chmod +x $(BIN)/dockcross-manylinux1-x86
235-
$(BIN)/dockcross-manylinux1-x86 /opt/python/cp38-cp38/bin/python test/run.py
236-
237-
#
238-
# base
239-
#
240161

241162
base: Dockerfile imagefiles/
242163
$(DOCKER) build -t $(ORG)/base:latest \

‎README.md‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -280,54 +280,6 @@ has installations of CMake, Ninja, and
280280
[scikit-build](http://scikit-build.org). For CMake, it sets
281281
[MANYLINUX2014]{.title-ref} to \"TRUE\" in the toolchain.
282282

283-
### dockcross/manylinux2010-x64
284-
285-
![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)
286-
287-
Docker [manylinux2010](https://github.com/pypa/manylinux)
288-
image for building Linux x86_64 / amd64 [Python wheel
289-
packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
290-
3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
291-
and it has installations of CMake, Ninja, and
292-
[scikit-build](http://scikit-build.org). For CMake, it sets
293-
[MANYLINUX2010]{.title-ref} to \"TRUE\" in the toolchain.
294-
295-
### dockcross/manylinux2010-x86
296-
297-
![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)
298-
299-
Docker [manylinux2010](https://github.com/pypa/manylinux) image for
300-
building Linux i686 [Python wheel
301-
packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
302-
3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
303-
and it has installations of CMake, Ninja, and
304-
[scikit-build](http://scikit-build.org). For CMake, it sets
305-
[MANYLINUX2010]{.title-ref} to \"TRUE\" in the toolchain.
306-
307-
### dockcross/manylinux1-x64
308-
309-
![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)
310-
311-
Docker [manylinux1](https://github.com/pypa/manylinux/tree/manylinux1)
312-
image for building Linux x86_64 / amd64 [Python wheel
313-
packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
314-
3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
315-
and it has installations of CMake, Ninja, and
316-
[scikit-build](http://scikit-build.org). For CMake, it sets
317-
[MANYLINUX1]{.title-ref} to \"TRUE\" in the toolchain.
318-
319-
### dockcross/manylinux1-x86
320-
321-
![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)
322-
323-
Docker [manylinux1](https://github.com/pypa/manylinux/tree/manylinux1)
324-
image for building Linux i686 [Python wheel
325-
packages](http://pythonwheels.com/). It includes Python 2.7, 3.4,
326-
3.5, 3.6, 3.7 and 3.8. Also has support for the dockcross script,
327-
and it has installations of CMake, Ninja, and
328-
[scikit-build](http://scikit-build.org). For CMake, it sets
329-
[MANYLINUX1]{.title-ref} to \"TRUE\" in the toolchain.
330-
331283
### dockcross/web-wasm
332284

333285
![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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ COPY \
1818
/buildscripts/
1919

2020
RUN \
21-
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 "") && \
21+
X86_FLAG=$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "-32" || echo "") && \
2222
/buildscripts/build-and-install-openssl.sh $X86_FLAG && \
2323
/buildscripts/build-and-install-openssh.sh && \
2424
/buildscripts/build-and-install-curl.sh && \

‎manylinux1-x64/Dockerfile.in‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎manylinux1-x64/Toolchain.cmake‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎manylinux1-x86/Dockerfile.in‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎manylinux1-x86/Toolchain.cmake‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎manylinux2010-x64/Dockerfile.in‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎manylinux2010-x64/Toolchain.cmake‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)