Merge pull request #240 from dockcross/update-manylinux

manylinux: Re-build images using latest base images
This commit is contained in:
Jean-Christophe Fillion-Robin 2018-07-10 01:45:00 +00:00 committed by GitHub
commit 69e5734004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -185,7 +185,7 @@ dockcross/linux-x86
:target: https://microbadger.com/images/dockcross/manylinux-x64
dockcross/manylinux-x64
|manylinux-x64-images| Docker `manylinux <https://github.com/pypa/manylinux>`_ image for building Linux x86_64 / amd64 `Python wheel packages <http://pythonwheels.com/>`_.
|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 and 3.7.
Also has support for the dockcross script, and it has installations of CMake, Ninja, and `scikit-build <http://scikit-build.org>`_
@ -193,7 +193,7 @@ dockcross/manylinux-x64
:target: https://microbadger.com/images/dockcross/manylinux-x86
dockcross/manylinux-x86
|manylinux-x86-images| Docker `manylinux <https://github.com/pypa/manylinux>`_ image for building Linux i686 `Python wheel packages <http://pythonwheels.com/>`_.
|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 and 3.7.
Also has support for the dockcross script, and it has installations of CMake, Ninja, and `scikit-build <http://scikit-build.org>`_

View File

@ -1,6 +1,9 @@
FROM dockcross/base:latest
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
RUN dpkg --add-architecture arm64 ; apt-get update
RUN \
sed -i '/debian-security/d' /etc/apt/sources.list && \
dpkg --add-architecture arm64 && \
apt-get update
# The cross-compiling emulator
RUN apt-get update && apt-get install -y \