Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-03 13:44:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename manylinux images to manylinux1

Browse Source
This commit is contained in:
Jean-Christophe Fillion-Robin 2019-05-22 03:05:11 -04:00
parent 8eecfcacb2
commit 1e0e89814b
No known key found for this signature in database
GPG Key ID: 307A5A242A6612E1
8 changed files with 73 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
.circleci/config.yml
View File

@ -286,46 +286,46 @@ jobs:
- save_cache: - save_cache:
key: linux-x86-assets-{{ .Revision }} key: linux-x86-assets-{{ .Revision }}
paths: ~/docker/linux-x86.tar paths: ~/docker/linux-x86.tar
manylinux-x64: manylinux1-x64:
<<: *build-settings <<: *build-settings
steps: steps:
- restore_cache: - restore_cache:
key: base-assets-{{ .Revision }} key: base-assets-{{ .Revision }}
- run: - run:
name: manylinux-x64 build name: manylinux1-x64 build
no_output_timeout: 1.5h no_output_timeout: 1.5h
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make manylinux-x64 make manylinux1-x64
tagged=$(docker images -q -f 'since=dockcross/manylinux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x64) tagged=$(docker images -q -f 'since=dockcross/manylinux1-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux1-x64)
docker save -o ~/docker/manylinux-x64.tar dockcross/manylinux-x64:latest $tagged docker save -o ~/docker/manylinux1-x64.tar dockcross/manylinux1-x64:latest $tagged
- run: - run:
name: manylinux-x64 test name: manylinux1-x64 test
command: | command: |
make manylinux-x64.test make manylinux1-x64.test
- save_cache: - save_cache:
key: manylinux-x64-assets-{{ .Revision }} key: manylinux1-x64-assets-{{ .Revision }}
paths: ~/docker/manylinux-x64.tar paths: ~/docker/manylinux1-x64.tar
manylinux-x86: manylinux1-x86:
<<: *build-settings <<: *build-settings
steps: steps:
- restore_cache: - restore_cache:
key: base-assets-{{ .Revision }} key: base-assets-{{ .Revision }}
- run: - run:
name: manylinux-x86 build name: manylinux1-x86 build
no_output_timeout: 1.5h no_output_timeout: 1.5h
command: | command: |
docker load -i ~/docker/base.tar docker load -i ~/docker/base.tar
make manylinux-x86 make manylinux1-x86
tagged=$(docker images -q -f 'since=dockcross/manylinux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x86) tagged=$(docker images -q -f 'since=dockcross/manylinux1-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux1-x86)
docker save -o ~/docker/manylinux-x86.tar dockcross/manylinux-x86:latest $tagged docker save -o ~/docker/manylinux1-x86.tar dockcross/manylinux1-x86:latest $tagged
- run: - run:
name: manylinux-x86 test name: manylinux1-x86 test
command: | command: |
make manylinux-x86.test make manylinux1-x86.test
- save_cache: - save_cache:
key: manylinux-x86-assets-{{ .Revision }} key: manylinux1-x86-assets-{{ .Revision }}
paths: ~/docker/manylinux-x86.tar paths: ~/docker/manylinux1-x86.tar
windows-static-x64: windows-static-x64:
<<: *build-settings <<: *build-settings
steps: steps:
@ -618,27 +618,27 @@ jobs:
docker push $tagged docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: manylinux-x64-assets-{{ .Revision }} key: manylinux1-x64-assets-{{ .Revision }}
- deploy: - deploy:
name: Deploy manylinux-x64 name: Deploy manylinux1-x64
command: | command: |
docker load -i ~/docker/manylinux-x64.tar docker load -i ~/docker/manylinux1-x64.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/manylinux-x64:latest docker push dockcross/manylinux1-x64:latest
tagged=$(docker images -q -f 'since=dockcross/manylinux-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x64) tagged=$(docker images -q -f 'since=dockcross/manylinux1-x64:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux1-x64)
docker push $tagged docker push $tagged
fi fi
- restore_cache: - restore_cache:
key: manylinux-x86-assets-{{ .Revision }} key: manylinux1-x86-assets-{{ .Revision }}
- deploy: - deploy:
name: Deploy manylinux-x86 name: Deploy manylinux1-x86
command: | command: |
docker load -i ~/docker/manylinux-x86.tar docker load -i ~/docker/manylinux1-x86.tar
if [ "${CIRCLE_BRANCH}" == "master" ]; then if [ "${CIRCLE_BRANCH}" == "master" ]; then
docker login -u $DOCKER_USER -p $DOCKER_PASS docker login -u $DOCKER_USER -p $DOCKER_PASS
docker push dockcross/manylinux-x86:latest docker push dockcross/manylinux1-x86:latest
tagged=$(docker images -q -f 'since=dockcross/manylinux-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux-x86) tagged=$(docker images -q -f 'since=dockcross/manylinux1-x86:latest' --format '{{.Repository}}:{{.Tag}}' | grep manylinux1-x86)
docker push $tagged docker push $tagged
fi fi
- restore_cache: - restore_cache:
@ -760,10 +760,10 @@ workflows:
- linux-x86: - linux-x86:
requires: requires:
- base - base
- manylinux-x64: - manylinux1-x64:
requires: requires:
- base - base
- manylinux-x86: - manylinux1-x86:
requires: requires:
- base - base
- windows-static-x64: - windows-static-x64:
@ -801,8 +801,8 @@ workflows:
#- linux-ppc64le #- linux-ppc64le
- linux-x64 - linux-x64
- linux-x86 - linux-x86
- manylinux-x64 - manylinux1-x64
- manylinux-x86 - manylinux1-x86
- windows-static-x64 - windows-static-x64
- windows-static-x64-posix - windows-static-x64-posix
- windows-static-x86 - windows-static-x86

51
Makefile
View File

@ -9,18 +9,18 @@ DOCKER = docker
# Docker organization to pull the images from # Docker organization to pull the images from
ORG = dockcross ORG = dockcross
# Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux-x64) # Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux1-x64)
BIN = ./bin BIN = ./bin
# These images are built using the "build implicit rule" # These images are built using the "build implicit rule"
STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-armv7a linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-armv7a linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
# Generated Dockerfiles. # Generated Dockerfiles.
GEN_IMAGES = linux-s390x linux-mips manylinux-x86 manylinux-x64 web-wasm linux-arm64 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-armv5 GEN_IMAGES = linux-s390x linux-mips manylinux1-x86 manylinux1-x64 web-wasm linux-arm64 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-armv5
GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES)) GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
# These images are expected to have explicit rules for *both* build and testing # These images are expected to have explicit rules for *both* build and testing
NON_STANDARD_IMAGES = web-wasm manylinux-x64 manylinux-x86 NON_STANDARD_IMAGES = web-wasm manylinux1-x64 manylinux1-x86
DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows
@ -98,53 +98,54 @@ web-wasm.test: web-wasm
rm -rf web-wasm/test rm -rf web-wasm/test
# #
# manylinux-x64 # manylinux1-x64
#
manylinux-x64: manylinux-x64/Dockerfile manylinux1-x64: manylinux1-x64/Dockerfile
mkdir -p $@/imagefiles && cp -r imagefiles $@/ mkdir -p $@/imagefiles && cp -r imagefiles $@/
$(DOCKER) build -t $(ORG)/manylinux-x64:latest \ $(DOCKER) build -t $(ORG)/manylinux1-x64:latest \
--build-arg IMAGE=$(ORG)/manylinux-x64 \ --build-arg IMAGE=$(ORG)/manylinux1-x64 \
--build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \ --build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x64/Dockerfile . -f manylinux1-x64/Dockerfile .
$(DOCKER) build -t $(ORG)/manylinux-x64:$(TAG) \ $(DOCKER) build -t $(ORG)/manylinux1-x64:$(TAG) \
--build-arg IMAGE=$(ORG)/manylinux-x64 \ --build-arg IMAGE=$(ORG)/manylinux1-x64 \
--build-arg VERSION=$(TAG) \ --build-arg VERSION=$(TAG) \
--build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \ --build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x64/Dockerfile . -f manylinux1-x64/Dockerfile .
rm -rf $@/imagefiles rm -rf $@/imagefiles
manylinux-x64.test: manylinux-x64 manylinux1-x64.test: manylinux1-x64
$(DOCKER) run $(RM) dockcross/manylinux-x64 > $(BIN)/dockcross-manylinux-x64 && chmod +x $(BIN)/dockcross-manylinux-x64 $(DOCKER) run $(RM) dockcross/manylinux1-x64 > $(BIN)/dockcross-manylinux1-x64 && chmod +x $(BIN)/dockcross-manylinux1-x64
$(BIN)/dockcross-manylinux-x64 /opt/python/cp35-cp35m/bin/python test/run.py $(BIN)/dockcross-manylinux1-x64 /opt/python/cp35-cp35m/bin/python test/run.py
# #
# manylinux-x86 # manylinux1-x86
# #
manylinux-x86: manylinux-x86/Dockerfile manylinux1-x86: manylinux1-x86/Dockerfile
mkdir -p $@/imagefiles && cp -r imagefiles $@/ mkdir -p $@/imagefiles && cp -r imagefiles $@/
$(DOCKER) build -t $(ORG)/manylinux-x86:latest \ $(DOCKER) build -t $(ORG)/manylinux1-x86:latest \
--build-arg IMAGE=$(ORG)/manylinux-x86 \ --build-arg IMAGE=$(ORG)/manylinux1-x86 \
--build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \ --build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x86/Dockerfile . -f manylinux1-x86/Dockerfile .
$(DOCKER) build -t $(ORG)/manylinux-x86:$(TAG) \ $(DOCKER) build -t $(ORG)/manylinux1-x86:$(TAG) \
--build-arg IMAGE=$(ORG)/manylinux-x86 \ --build-arg IMAGE=$(ORG)/manylinux1-x86 \
--build-arg VERSION=$(TAG) \ --build-arg VERSION=$(TAG) \
--build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg VCS_URL=`git config --get remote.origin.url` \ --build-arg VCS_URL=`git config --get remote.origin.url` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-f manylinux-x86/Dockerfile . -f manylinux1-x86/Dockerfile .
rm -rf $@/imagefiles rm -rf $@/imagefiles
manylinux-x86.test: manylinux-x86 manylinux1-x86.test: manylinux1-x86
$(DOCKER) run $(RM) dockcross/manylinux-x86 > $(BIN)/dockcross-manylinux-x86 && chmod +x $(BIN)/dockcross-manylinux-x86 $(DOCKER) run $(RM) dockcross/manylinux1-x86 > $(BIN)/dockcross-manylinux1-x86 && chmod +x $(BIN)/dockcross-manylinux1-x86
$(BIN)/dockcross-manylinux-x86 /opt/python/cp35-cp35m/bin/python test/run.py $(BIN)/dockcross-manylinux1-x86 /opt/python/cp35-cp35m/bin/python test/run.py
# #
# base # base

16
README.rst
View File

@ -182,19 +182,19 @@ dockcross/linux-x86
|linux-x86-images| Linux i686 cross compiler. |linux-x86-images| Linux i686 cross compiler.
.. |manylinux-x64-images| image:: https://images.microbadger.com/badges/image/dockcross/manylinux-x64.svg .. |manylinux1-x64-images| image:: https://images.microbadger.com/badges/image/dockcross/manylinux1-x64.svg
:target: https://microbadger.com/images/dockcross/manylinux-x64 :target: https://microbadger.com/images/dockcross/manylinux1-x64
dockcross/manylinux-x64 dockcross/manylinux1-x64
|manylinux-x64-images| Docker `manylinux <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. |manylinux1-x64-images| 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>`_ Also has support for the dockcross script, and it has installations of CMake, Ninja, and `scikit-build <http://scikit-build.org>`_
.. |manylinux-x86-images| image:: https://images.microbadger.com/badges/image/dockcross/manylinux-x86.svg .. |manylinux1-x86-images| image:: https://images.microbadger.com/badges/image/dockcross/manylinux1-x86.svg
:target: https://microbadger.com/images/dockcross/manylinux-x86 :target: https://microbadger.com/images/dockcross/manylinux1-x86
dockcross/manylinux-x86 dockcross/manylinux1-x86
|manylinux-x86-images| Docker `manylinux <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. |manylinux1-x86-images| 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>`_ Also has support for the dockcross script, and it has installations of CMake, Ninja, and `scikit-build <http://scikit-build.org>`_

2
common.docker
View File

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

6
manylinux-x64/Dockerfile.in → manylinux1-x64/Dockerfile.in
View File

@ -1,7 +1,7 @@
FROM scikitbuild/manylinux1_x86_64:91cb02fb8 FROM scikitbuild/manylinux1_x86_64:91cb02fb8
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x64 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64
#include "common.manylinux" #include "common.manylinux"
@ -19,12 +19,12 @@ ENV AS=${CROSS_ROOT}/as \
COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
COPY manylinux-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/ COPY manylinux1-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE=dockcross/manylinux-x64 ARG IMAGE=dockcross/manylinux1-x64
ARG VERSION=latest ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL

0
manylinux-x64/Toolchain.cmake → manylinux1-x64/Toolchain.cmake
View File

6
manylinux-x86/Dockerfile.in → manylinux1-x86/Dockerfile.in
View File

@ -1,7 +1,7 @@
FROM scikitbuild/manylinux1_i686:91cb02fb8 FROM scikitbuild/manylinux1_i686:91cb02fb8
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x86 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86
#include "common.manylinux" #include "common.manylinux"
@ -19,7 +19,7 @@ ENV AS=${CROSS_ROOT}/as \
COPY linux-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop COPY linux-x86/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
COPY manylinux-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/ COPY manylinux1-x86/Toolchain.cmake ${CROSS_ROOT}/../lib/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
COPY linux-x86/linux32-entrypoint.sh /dockcross/ COPY linux-x86/linux32-entrypoint.sh /dockcross/
@ -27,7 +27,7 @@ ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
# Build-time metadata as defined at http://label-schema.org # Build-time metadata as defined at http://label-schema.org
ARG BUILD_DATE ARG BUILD_DATE
ARG IMAGE=dockcross/manylinux-x86 ARG IMAGE=dockcross/manylinux1-x86
ARG VERSION=latest ARG VERSION=latest
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL

0
manylinux-x86/Toolchain.cmake → manylinux1-x86/Toolchain.cmake
View File