From 60a37a604eda68d4bd74ccfc6a85202415e53027 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 9 Jul 2018 14:58:47 -0400 Subject: [PATCH 1/2] manylinux: Re-build images using latest base images The purpose of this commit is to rebuild the dockcross images against the latest manylinux images including Python 3.7 and also updated setuptools, autitwheel, git, curl, ... Note that python 3.3 was removed from the image. $ docker run -ti --rm quay.io/pypa/manylinux1_x86_64 bash -c "ls -1 /opt/python/" cp27-cp27m cp27-cp27mu cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 010da92..c431cfa 100644 --- a/README.rst +++ b/README.rst @@ -185,7 +185,7 @@ dockcross/linux-x86 :target: https://microbadger.com/images/dockcross/manylinux-x64 dockcross/manylinux-x64 - |manylinux-x64-images| Docker `manylinux `_ image for building Linux x86_64 / amd64 `Python wheel packages `_. + |manylinux-x64-images| Docker `manylinux `_ image for building Linux x86_64 / amd64 `Python wheel packages `_. 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 `_ @@ -193,7 +193,7 @@ dockcross/manylinux-x64 :target: https://microbadger.com/images/dockcross/manylinux-x86 dockcross/manylinux-x86 - |manylinux-x86-images| Docker `manylinux `_ image for building Linux i686 `Python wheel packages `_. + |manylinux-x86-images| Docker `manylinux `_ image for building Linux i686 `Python wheel packages `_. 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 `_ From 2936ea53c72e178565730f9376925765e7943f0b Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 9 Jul 2018 19:05:45 -0400 Subject: [PATCH 2/2] android=arm64: Fix image build removing "debian-security" from sources.list This commit is an attempt to fix the following error: W: Failed to fetch http://cdn-fastly.deb.debian.org/debian-security/dists/jessie/updates/InRelease Unable to find expected entry 'main/binary-arm64/Packages' in Release file (Wrong sources.list entry or malformed file) E: Some index files failed to download. They have been ignored, or old ones used instead. Looking at "http://cdn-fastly.deb.debian.org/debian-security/dists/jessie/updates/InRelease", it doesn't list "arm64", it only lists the following ones: Architectures: amd64 armel armhf i386 Considering that the build of June 15 was successful (see https://circleci.com/gh/dockcross/dockcross/1950), the architecture was most likely dropped in a recent update. It could be related to the fact security support for Debian Jessie ended on June 17 2018. See https://en.wikipedia.org/wiki/Debian_version_history#Release_table --- android-arm64/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/android-arm64/Dockerfile b/android-arm64/Dockerfile index 5d1d3cb..1bcded3 100644 --- a/android-arm64/Dockerfile +++ b/android-arm64/Dockerfile @@ -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 \