From 8282e3f32ffab5c6b23720b55da44e850c5f7684 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 15 Jun 2017 17:07:21 -0700 Subject: [PATCH] Fix _ctypes test failure on Alpine and build failure on Debian on ppc64le --- 3.3/Dockerfile | 2 ++ 3.3/alpine/Dockerfile | 4 ++++ 3.3/slim/Dockerfile | 6 ++++++ 3.3/wheezy/Dockerfile | 2 ++ 3.4/Dockerfile | 2 ++ 3.4/alpine/Dockerfile | 4 ++++ 3.4/slim/Dockerfile | 6 ++++++ 3.4/wheezy/Dockerfile | 2 ++ 3.5/Dockerfile | 2 ++ 3.5/alpine/Dockerfile | 4 ++++ 3.5/slim/Dockerfile | 6 ++++++ 3.6/Dockerfile | 2 ++ 3.6/alpine/Dockerfile | 4 ++++ 3.6/alpine3.6/Dockerfile | 4 ++++ 3.6/slim/Dockerfile | 6 ++++++ Dockerfile-alpine.template | 4 ++++ Dockerfile-debian.template | 2 ++ Dockerfile-slim.template | 6 ++++++ 18 files changed, 68 insertions(+) diff --git a/3.3/Dockerfile b/3.3/Dockerfile index 9b7c27fc1..539cc7c3d 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile index e54cdd145..419e1d83c 100644 --- a/3.3/alpine/Dockerfile +++ b/3.3/alpine/Dockerfile @@ -41,9 +41,11 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ linux-headers \ make \ ncurses-dev \ @@ -66,6 +68,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile index eb9886bf7..194009d16 100644 --- a/3.3/slim/Dockerfile +++ b/3.3/slim/Dockerfile @@ -16,6 +16,8 @@ ENV LANG C.UTF-8 # runtime dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ + libexpat1 \ + libffi6 \ libgdbm3 \ libsqlite3-0 \ libssl1.0.0 \ @@ -30,6 +32,8 @@ RUN set -ex \ gcc \ libbz2-dev \ libc6-dev \ + libexpat1-dev \ + libffi-dev \ libgdbm-dev \ liblzma-dev \ libncurses-dev \ @@ -61,6 +65,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile index d1feddcef..5738e9170 100644 --- a/3.3/wheezy/Dockerfile +++ b/3.3/wheezy/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.4/Dockerfile b/3.4/Dockerfile index c690c53f3..a5d2e57ed 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile index 3a383ddd1..3d85af963 100644 --- a/3.4/alpine/Dockerfile +++ b/3.4/alpine/Dockerfile @@ -41,9 +41,11 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ linux-headers \ make \ ncurses-dev \ @@ -66,6 +68,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile index dc3e05307..c8d983da3 100644 --- a/3.4/slim/Dockerfile +++ b/3.4/slim/Dockerfile @@ -16,6 +16,8 @@ ENV LANG C.UTF-8 # runtime dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ + libexpat1 \ + libffi6 \ libgdbm3 \ libsqlite3-0 \ libssl1.0.0 \ @@ -30,6 +32,8 @@ RUN set -ex \ gcc \ libbz2-dev \ libc6-dev \ + libexpat1-dev \ + libffi-dev \ libgdbm-dev \ liblzma-dev \ libncurses-dev \ @@ -61,6 +65,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index 64c0ce2be..d9008ab94 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.5/Dockerfile b/3.5/Dockerfile index 49a8a8543..73b63f3b5 100644 --- a/3.5/Dockerfile +++ b/3.5/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile index 65fd215b5..5b0160018 100644 --- a/3.5/alpine/Dockerfile +++ b/3.5/alpine/Dockerfile @@ -41,9 +41,11 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ linux-headers \ make \ ncurses-dev \ @@ -66,6 +68,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile index 4f9787ab0..61039b19a 100644 --- a/3.5/slim/Dockerfile +++ b/3.5/slim/Dockerfile @@ -16,6 +16,8 @@ ENV LANG C.UTF-8 # runtime dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ + libexpat1 \ + libffi6 \ libgdbm3 \ libsqlite3-0 \ libssl1.0.0 \ @@ -30,6 +32,8 @@ RUN set -ex \ gcc \ libbz2-dev \ libc6-dev \ + libexpat1-dev \ + libffi-dev \ libgdbm-dev \ liblzma-dev \ libncurses-dev \ @@ -61,6 +65,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.6/Dockerfile b/3.6/Dockerfile index 893a0844c..530d26297 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -46,6 +46,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile index d6de7751d..0b481b668 100644 --- a/3.6/alpine/Dockerfile +++ b/3.6/alpine/Dockerfile @@ -41,9 +41,11 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ linux-headers \ make \ ncurses-dev \ @@ -66,6 +68,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.6/alpine3.6/Dockerfile b/3.6/alpine3.6/Dockerfile index 4238d889b..f82c07e1e 100644 --- a/3.6/alpine3.6/Dockerfile +++ b/3.6/alpine3.6/Dockerfile @@ -41,9 +41,11 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ linux-headers \ make \ ncurses-dev \ @@ -66,6 +68,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/3.6/slim/Dockerfile b/3.6/slim/Dockerfile index 186f83d07..9e7ead874 100644 --- a/3.6/slim/Dockerfile +++ b/3.6/slim/Dockerfile @@ -16,6 +16,8 @@ ENV LANG C.UTF-8 # runtime dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ + libexpat1 \ + libffi6 \ libgdbm3 \ libsqlite3-0 \ libssl1.0.0 \ @@ -30,6 +32,8 @@ RUN set -ex \ gcc \ libbz2-dev \ libc6-dev \ + libexpat1-dev \ + libffi-dev \ libgdbm-dev \ liblzma-dev \ libncurses-dev \ @@ -61,6 +65,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 098f69e5f..40dd0f2fb 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -35,9 +35,11 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ linux-headers \ make \ ncurses-dev \ @@ -60,6 +62,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index e66ef2980..2f6dfaf06 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -40,6 +40,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 5fc4584c5..1068e587e 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -10,6 +10,8 @@ ENV LANG C.UTF-8 # runtime dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ + libexpat1 \ + libffi6 \ libgdbm3 \ libsqlite3-0 \ libssl1.0.0 \ @@ -24,6 +26,8 @@ RUN set -ex \ gcc \ libbz2-dev \ libc6-dev \ + libexpat1-dev \ + libffi-dev \ libgdbm-dev \ liblzma-dev \ libncurses-dev \ @@ -55,6 +59,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-loadable-sqlite-extensions \ --enable-shared \ + --with-system-expat \ + --with-system-ffi \ --without-ensurepip \ && make -j "$(nproc)" \ && make install \