From 38d79c3c36eac194eda071ddbbb9124362291049 Mon Sep 17 00:00:00 2001 From: Bo Lopker Date: Sat, 1 Dec 2018 08:27:00 -0800 Subject: [PATCH 1/7] Enable optimizations --- Dockerfile-alpine.template | 1 + Dockerfile-caveman-alpine.template | 1 + Dockerfile-caveman-debian.template | 1 + Dockerfile-caveman-slim.template | 1 + Dockerfile-debian.template | 1 + Dockerfile-slim.template | 1 + 6 files changed, 6 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 9f2a84eb6..a2b1f668a 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -70,6 +70,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template index b4239a104..257f9ba6d 100644 --- a/Dockerfile-caveman-alpine.template +++ b/Dockerfile-caveman-alpine.template @@ -65,6 +65,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/Dockerfile-caveman-debian.template b/Dockerfile-caveman-debian.template index a38778791..e2f6a7c7b 100644 --- a/Dockerfile-caveman-debian.template +++ b/Dockerfile-caveman-debian.template @@ -36,6 +36,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/Dockerfile-caveman-slim.template b/Dockerfile-caveman-slim.template index 8a96f06d7..7e69cbed3 100644 --- a/Dockerfile-caveman-slim.template +++ b/Dockerfile-caveman-slim.template @@ -57,6 +57,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8a6db92d3..0d3f51a95 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -40,6 +40,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index a62087e4b..7f55881a2 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -61,6 +61,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ From 4d7a9a8a1f09b13ceba435f2bb9e05205b5a7cd7 Mon Sep 17 00:00:00 2001 From: Bo Lopker Date: Sat, 1 Dec 2018 08:33:05 -0800 Subject: [PATCH 2/7] Run update --- 2.7/alpine3.6/Dockerfile | 1 + 2.7/alpine3.7/Dockerfile | 1 + 2.7/alpine3.8/Dockerfile | 1 + 2.7/jessie/Dockerfile | 1 + 2.7/jessie/slim/Dockerfile | 1 + 2.7/stretch/Dockerfile | 1 + 2.7/stretch/slim/Dockerfile | 1 + 2.7/wheezy/Dockerfile | 1 + 3.4/alpine3.7/Dockerfile | 1 + 3.4/alpine3.8/Dockerfile | 1 + 3.4/jessie/Dockerfile | 1 + 3.4/jessie/slim/Dockerfile | 1 + 3.4/stretch/Dockerfile | 1 + 3.4/stretch/slim/Dockerfile | 1 + 3.4/wheezy/Dockerfile | 1 + 3.5/alpine3.7/Dockerfile | 1 + 3.5/alpine3.8/Dockerfile | 1 + 3.5/jessie/Dockerfile | 1 + 3.5/jessie/slim/Dockerfile | 1 + 3.5/stretch/Dockerfile | 1 + 3.5/stretch/slim/Dockerfile | 1 + 3.6/alpine3.6/Dockerfile | 1 + 3.6/alpine3.7/Dockerfile | 1 + 3.6/alpine3.8/Dockerfile | 1 + 3.6/jessie/Dockerfile | 1 + 3.6/jessie/slim/Dockerfile | 1 + 3.6/stretch/Dockerfile | 1 + 3.6/stretch/slim/Dockerfile | 1 + 3.7/alpine3.7/Dockerfile | 1 + 3.7/alpine3.8/Dockerfile | 1 + 3.7/stretch/Dockerfile | 1 + 3.7/stretch/slim/Dockerfile | 1 + 32 files changed, 32 insertions(+) diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile index 27e4273f1..3dd33d37e 100644 --- a/2.7/alpine3.6/Dockerfile +++ b/2.7/alpine3.6/Dockerfile @@ -69,6 +69,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile index 0393e06bd..8b86fb933 100644 --- a/2.7/alpine3.7/Dockerfile +++ b/2.7/alpine3.7/Dockerfile @@ -69,6 +69,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/2.7/alpine3.8/Dockerfile b/2.7/alpine3.8/Dockerfile index a3fa6e6e5..eb47fd029 100644 --- a/2.7/alpine3.8/Dockerfile +++ b/2.7/alpine3.8/Dockerfile @@ -69,6 +69,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/2.7/jessie/Dockerfile b/2.7/jessie/Dockerfile index ccade24d0..df67fbeef 100644 --- a/2.7/jessie/Dockerfile +++ b/2.7/jessie/Dockerfile @@ -42,6 +42,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/jessie/slim/Dockerfile b/2.7/jessie/slim/Dockerfile index 46dbc7ee7..febe80ad5 100644 --- a/2.7/jessie/slim/Dockerfile +++ b/2.7/jessie/slim/Dockerfile @@ -63,6 +63,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/stretch/Dockerfile b/2.7/stretch/Dockerfile index 7ffb21d2a..9cf80d87c 100644 --- a/2.7/stretch/Dockerfile +++ b/2.7/stretch/Dockerfile @@ -42,6 +42,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/stretch/slim/Dockerfile b/2.7/stretch/slim/Dockerfile index 5edc5e159..27ae1256d 100644 --- a/2.7/stretch/slim/Dockerfile +++ b/2.7/stretch/slim/Dockerfile @@ -63,6 +63,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile index 9189538be..9081a51a4 100644 --- a/2.7/wheezy/Dockerfile +++ b/2.7/wheezy/Dockerfile @@ -42,6 +42,7 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/alpine3.7/Dockerfile b/3.4/alpine3.7/Dockerfile index 0d20ba0ad..d47726976 100644 --- a/3.4/alpine3.7/Dockerfile +++ b/3.4/alpine3.7/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.4/alpine3.8/Dockerfile b/3.4/alpine3.8/Dockerfile index 0233bf969..4308dc9a3 100644 --- a/3.4/alpine3.8/Dockerfile +++ b/3.4/alpine3.8/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.4/jessie/Dockerfile b/3.4/jessie/Dockerfile index a5784289f..2cdfc48fc 100644 --- a/3.4/jessie/Dockerfile +++ b/3.4/jessie/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/jessie/slim/Dockerfile b/3.4/jessie/slim/Dockerfile index 0554592e0..95f9647b8 100644 --- a/3.4/jessie/slim/Dockerfile +++ b/3.4/jessie/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/stretch/Dockerfile b/3.4/stretch/Dockerfile index 31f2fea4a..81d01fe6e 100644 --- a/3.4/stretch/Dockerfile +++ b/3.4/stretch/Dockerfile @@ -45,6 +45,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/stretch/slim/Dockerfile b/3.4/stretch/slim/Dockerfile index 353034e62..014930345 100644 --- a/3.4/stretch/slim/Dockerfile +++ b/3.4/stretch/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index ca184534e..b787263a7 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/alpine3.7/Dockerfile b/3.5/alpine3.7/Dockerfile index 3c25f6b17..65e1fe0f5 100644 --- a/3.5/alpine3.7/Dockerfile +++ b/3.5/alpine3.7/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.5/alpine3.8/Dockerfile b/3.5/alpine3.8/Dockerfile index 1eb7686f1..67ec411af 100644 --- a/3.5/alpine3.8/Dockerfile +++ b/3.5/alpine3.8/Dockerfile @@ -71,6 +71,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.5/jessie/Dockerfile b/3.5/jessie/Dockerfile index 4997e28b5..118431bfa 100644 --- a/3.5/jessie/Dockerfile +++ b/3.5/jessie/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/jessie/slim/Dockerfile b/3.5/jessie/slim/Dockerfile index cc5849b45..e0c37c431 100644 --- a/3.5/jessie/slim/Dockerfile +++ b/3.5/jessie/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/stretch/Dockerfile b/3.5/stretch/Dockerfile index 31b1d525b..45be9ad21 100644 --- a/3.5/stretch/Dockerfile +++ b/3.5/stretch/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.5/stretch/slim/Dockerfile b/3.5/stretch/slim/Dockerfile index 3259bde56..3bb98eef4 100644 --- a/3.5/stretch/slim/Dockerfile +++ b/3.5/stretch/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/alpine3.6/Dockerfile b/3.6/alpine3.6/Dockerfile index eeff2082c..fcb41cc2f 100644 --- a/3.6/alpine3.6/Dockerfile +++ b/3.6/alpine3.6/Dockerfile @@ -73,6 +73,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.6/alpine3.7/Dockerfile b/3.6/alpine3.7/Dockerfile index f3d509fc6..05472e7d5 100644 --- a/3.6/alpine3.7/Dockerfile +++ b/3.6/alpine3.7/Dockerfile @@ -73,6 +73,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.6/alpine3.8/Dockerfile b/3.6/alpine3.8/Dockerfile index c3589ccce..f73313cd1 100644 --- a/3.6/alpine3.8/Dockerfile +++ b/3.6/alpine3.8/Dockerfile @@ -73,6 +73,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.6/jessie/Dockerfile b/3.6/jessie/Dockerfile index cd9e1ecd1..3dcb881fb 100644 --- a/3.6/jessie/Dockerfile +++ b/3.6/jessie/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/jessie/slim/Dockerfile b/3.6/jessie/slim/Dockerfile index 3338d8886..faaf97423 100644 --- a/3.6/jessie/slim/Dockerfile +++ b/3.6/jessie/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/stretch/Dockerfile b/3.6/stretch/Dockerfile index 03704523a..1c48e1e5f 100644 --- a/3.6/stretch/Dockerfile +++ b/3.6/stretch/Dockerfile @@ -43,6 +43,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile index 836ccb70a..afb58e6ec 100644 --- a/3.6/stretch/slim/Dockerfile +++ b/3.6/stretch/slim/Dockerfile @@ -66,6 +66,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.7/alpine3.7/Dockerfile b/3.7/alpine3.7/Dockerfile index 3ac286c19..9b221cb4b 100644 --- a/3.7/alpine3.7/Dockerfile +++ b/3.7/alpine3.7/Dockerfile @@ -74,6 +74,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.7/alpine3.8/Dockerfile b/3.7/alpine3.8/Dockerfile index 0d3bf2837..efed45c86 100644 --- a/3.7/alpine3.8/Dockerfile +++ b/3.7/alpine3.8/Dockerfile @@ -74,6 +74,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 diff --git a/3.7/stretch/Dockerfile b/3.7/stretch/Dockerfile index e8ace9eb8..08c3ca17e 100644 --- a/3.7/stretch/Dockerfile +++ b/3.7/stretch/Dockerfile @@ -44,6 +44,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ diff --git a/3.7/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile index 074cd6b84..3f2c656bd 100644 --- a/3.7/stretch/slim/Dockerfile +++ b/3.7/stretch/slim/Dockerfile @@ -67,6 +67,7 @@ RUN set -ex \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ + --enable-optimizations \ && make -j "$(nproc)" \ && make install \ && ldconfig \ From 73a09cd396f4f667ad924b38c0795bc7e6d056db Mon Sep 17 00:00:00 2001 From: Bo Lopker Date: Sat, 1 Dec 2018 12:26:38 -0800 Subject: [PATCH 3/7] Try to add system ffi and expat --- 2.7/alpine3.6/Dockerfile | 7 +++++++ 2.7/alpine3.7/Dockerfile | 7 +++++++ 2.7/alpine3.8/Dockerfile | 7 +++++++ Dockerfile-caveman-alpine.template | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile index 3dd33d37e..eb72d91a0 100644 --- a/2.7/alpine3.6/Dockerfile +++ b/2.7/alpine3.6/Dockerfile @@ -44,21 +44,26 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libressl \ libressl-dev \ linux-headers \ make \ ncurses-dev \ + openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ tcl-dev \ tk \ tk-dev \ + util-linux-dev \ + xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ @@ -69,6 +74,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile index 8b86fb933..7811d9b58 100644 --- a/2.7/alpine3.7/Dockerfile +++ b/2.7/alpine3.7/Dockerfile @@ -43,22 +43,27 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libnsl-dev \ libressl-dev \ libtirpc-dev \ linux-headers \ make \ ncurses-dev \ + openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ tcl-dev \ tk \ tk-dev \ + util-linux-dev \ + xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ @@ -69,6 +74,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() diff --git a/2.7/alpine3.8/Dockerfile b/2.7/alpine3.8/Dockerfile index eb47fd029..f590e8309 100644 --- a/2.7/alpine3.8/Dockerfile +++ b/2.7/alpine3.8/Dockerfile @@ -43,22 +43,27 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libnsl-dev \ libressl-dev \ libtirpc-dev \ linux-headers \ make \ ncurses-dev \ + openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ tcl-dev \ tk \ tk-dev \ + util-linux-dev \ + xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ @@ -69,6 +74,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template index 257f9ba6d..7a35fb5f1 100644 --- a/Dockerfile-caveman-alpine.template +++ b/Dockerfile-caveman-alpine.template @@ -38,10 +38,12 @@ RUN set -ex \ bzip2-dev \ coreutils \ dpkg-dev dpkg \ + expat-dev \ findutils \ gcc \ gdbm-dev \ libc-dev \ + libffi-dev \ libnsl-dev \ libressl \ libressl-dev \ @@ -49,12 +51,15 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ + openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ tcl-dev \ tk \ tk-dev \ + util-linux-dev \ + xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ @@ -65,6 +70,8 @@ RUN set -ex \ --build="$gnuArch" \ --enable-shared \ --enable-unicode=ucs4 \ + --with-system-expat \ + --with-system-ffi \ --enable-optimizations \ && make -j "$(nproc)" \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() From ad7d5744eda9bab13413371d16fbf729b8a039bf Mon Sep 17 00:00:00 2001 From: Bo Lopker Date: Sat, 1 Dec 2018 12:27:19 -0800 Subject: [PATCH 4/7] Make builds faster --- .travis.yml | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 560c2a270..f0761590a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,35 +2,35 @@ language: bash services: docker env: - - VERSION=3.7 VARIANT=stretch - - VERSION=3.7 VARIANT=stretch/slim - - VERSION=3.7 VARIANT=alpine3.8 - - VERSION=3.7 VARIANT=alpine3.7 - - VERSION=3.6 VARIANT=stretch - - VERSION=3.6 VARIANT=stretch/slim - - VERSION=3.6 VARIANT=jessie - - VERSION=3.6 VARIANT=jessie/slim - - VERSION=3.6 VARIANT=alpine3.8 - - VERSION=3.6 VARIANT=alpine3.7 - - VERSION=3.6 VARIANT=alpine3.6 - - VERSION=3.5 VARIANT=stretch - - VERSION=3.5 VARIANT=stretch/slim - - VERSION=3.5 VARIANT=jessie - - VERSION=3.5 VARIANT=jessie/slim - - VERSION=3.5 VARIANT=alpine3.8 - - VERSION=3.5 VARIANT=alpine3.7 - - VERSION=3.4 VARIANT=stretch - - VERSION=3.4 VARIANT=stretch/slim - - VERSION=3.4 VARIANT=jessie - - VERSION=3.4 VARIANT=jessie/slim - - VERSION=3.4 VARIANT=wheezy - - VERSION=3.4 VARIANT=alpine3.8 - - VERSION=3.4 VARIANT=alpine3.7 - - VERSION=2.7 VARIANT=stretch - - VERSION=2.7 VARIANT=stretch/slim - - VERSION=2.7 VARIANT=jessie + # - VERSION=3.7 VARIANT=stretch + # - VERSION=3.7 VARIANT=stretch/slim + # - VERSION=3.7 VARIANT=alpine3.8 + # - VERSION=3.7 VARIANT=alpine3.7 + # - VERSION=3.6 VARIANT=stretch + # - VERSION=3.6 VARIANT=stretch/slim + # - VERSION=3.6 VARIANT=jessie + # - VERSION=3.6 VARIANT=jessie/slim + # - VERSION=3.6 VARIANT=alpine3.8 + # - VERSION=3.6 VARIANT=alpine3.7 + # - VERSION=3.6 VARIANT=alpine3.6 + # - VERSION=3.5 VARIANT=stretch + # - VERSION=3.5 VARIANT=stretch/slim + # - VERSION=3.5 VARIANT=jessie + # - VERSION=3.5 VARIANT=jessie/slim + # - VERSION=3.5 VARIANT=alpine3.8 + # - VERSION=3.5 VARIANT=alpine3.7 + # - VERSION=3.4 VARIANT=stretch + # - VERSION=3.4 VARIANT=stretch/slim + # - VERSION=3.4 VARIANT=jessie + # - VERSION=3.4 VARIANT=jessie/slim + # - VERSION=3.4 VARIANT=wheezy + # - VERSION=3.4 VARIANT=alpine3.8 + # - VERSION=3.4 VARIANT=alpine3.7 + # - VERSION=2.7 VARIANT=stretch + # - VERSION=2.7 VARIANT=stretch/slim + # - VERSION=2.7 VARIANT=jessie - VERSION=2.7 VARIANT=jessie/slim - - VERSION=2.7 VARIANT=wheezy + # - VERSION=2.7 VARIANT=wheezy - VERSION=2.7 VARIANT=alpine3.8 - VERSION=2.7 VARIANT=alpine3.7 - VERSION=2.7 VARIANT=alpine3.6 From 2bcfb4fedb8a327358db43bceec8dbe0c241e0d5 Mon Sep 17 00:00:00 2001 From: Bo Lopker Date: Sat, 1 Dec 2018 16:43:01 -0800 Subject: [PATCH 5/7] Remove openssl --- 2.7/alpine3.6/Dockerfile | 1 - 2.7/alpine3.7/Dockerfile | 1 - 2.7/alpine3.8/Dockerfile | 1 - Dockerfile-caveman-alpine.template | 1 - 4 files changed, 4 deletions(-) diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile index eb72d91a0..d314e545a 100644 --- a/2.7/alpine3.6/Dockerfile +++ b/2.7/alpine3.6/Dockerfile @@ -55,7 +55,6 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ - openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile index 7811d9b58..46784c3b5 100644 --- a/2.7/alpine3.7/Dockerfile +++ b/2.7/alpine3.7/Dockerfile @@ -55,7 +55,6 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ - openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ diff --git a/2.7/alpine3.8/Dockerfile b/2.7/alpine3.8/Dockerfile index f590e8309..27a2745d1 100644 --- a/2.7/alpine3.8/Dockerfile +++ b/2.7/alpine3.8/Dockerfile @@ -55,7 +55,6 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ - openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template index 7a35fb5f1..0087e98c9 100644 --- a/Dockerfile-caveman-alpine.template +++ b/Dockerfile-caveman-alpine.template @@ -51,7 +51,6 @@ RUN set -ex \ linux-headers \ make \ ncurses-dev \ - openssl-dev \ pax-utils \ readline-dev \ sqlite-dev \ From 2ee089873965020ce03309f69577a1b564e50f06 Mon Sep 17 00:00:00 2001 From: Bo Lopker Date: Sat, 1 Dec 2018 17:12:29 -0800 Subject: [PATCH 6/7] Add jobs back --- .travis.yml | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0761590a..560c2a270 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,35 +2,35 @@ language: bash services: docker env: - # - VERSION=3.7 VARIANT=stretch - # - VERSION=3.7 VARIANT=stretch/slim - # - VERSION=3.7 VARIANT=alpine3.8 - # - VERSION=3.7 VARIANT=alpine3.7 - # - VERSION=3.6 VARIANT=stretch - # - VERSION=3.6 VARIANT=stretch/slim - # - VERSION=3.6 VARIANT=jessie - # - VERSION=3.6 VARIANT=jessie/slim - # - VERSION=3.6 VARIANT=alpine3.8 - # - VERSION=3.6 VARIANT=alpine3.7 - # - VERSION=3.6 VARIANT=alpine3.6 - # - VERSION=3.5 VARIANT=stretch - # - VERSION=3.5 VARIANT=stretch/slim - # - VERSION=3.5 VARIANT=jessie - # - VERSION=3.5 VARIANT=jessie/slim - # - VERSION=3.5 VARIANT=alpine3.8 - # - VERSION=3.5 VARIANT=alpine3.7 - # - VERSION=3.4 VARIANT=stretch - # - VERSION=3.4 VARIANT=stretch/slim - # - VERSION=3.4 VARIANT=jessie - # - VERSION=3.4 VARIANT=jessie/slim - # - VERSION=3.4 VARIANT=wheezy - # - VERSION=3.4 VARIANT=alpine3.8 - # - VERSION=3.4 VARIANT=alpine3.7 - # - VERSION=2.7 VARIANT=stretch - # - VERSION=2.7 VARIANT=stretch/slim - # - VERSION=2.7 VARIANT=jessie + - VERSION=3.7 VARIANT=stretch + - VERSION=3.7 VARIANT=stretch/slim + - VERSION=3.7 VARIANT=alpine3.8 + - VERSION=3.7 VARIANT=alpine3.7 + - VERSION=3.6 VARIANT=stretch + - VERSION=3.6 VARIANT=stretch/slim + - VERSION=3.6 VARIANT=jessie + - VERSION=3.6 VARIANT=jessie/slim + - VERSION=3.6 VARIANT=alpine3.8 + - VERSION=3.6 VARIANT=alpine3.7 + - VERSION=3.6 VARIANT=alpine3.6 + - VERSION=3.5 VARIANT=stretch + - VERSION=3.5 VARIANT=stretch/slim + - VERSION=3.5 VARIANT=jessie + - VERSION=3.5 VARIANT=jessie/slim + - VERSION=3.5 VARIANT=alpine3.8 + - VERSION=3.5 VARIANT=alpine3.7 + - VERSION=3.4 VARIANT=stretch + - VERSION=3.4 VARIANT=stretch/slim + - VERSION=3.4 VARIANT=jessie + - VERSION=3.4 VARIANT=jessie/slim + - VERSION=3.4 VARIANT=wheezy + - VERSION=3.4 VARIANT=alpine3.8 + - VERSION=3.4 VARIANT=alpine3.7 + - VERSION=2.7 VARIANT=stretch + - VERSION=2.7 VARIANT=stretch/slim + - VERSION=2.7 VARIANT=jessie - VERSION=2.7 VARIANT=jessie/slim - # - VERSION=2.7 VARIANT=wheezy + - VERSION=2.7 VARIANT=wheezy - VERSION=2.7 VARIANT=alpine3.8 - VERSION=2.7 VARIANT=alpine3.7 - VERSION=2.7 VARIANT=alpine3.6 From b9746760e9e5e04b7c431006be79dc154047856c Mon Sep 17 00:00:00 2001 From: Bo Lopker Date: Sat, 1 Dec 2018 18:58:00 -0800 Subject: [PATCH 7/7] Remove extra packages --- 2.7/alpine3.6/Dockerfile | 2 -- 2.7/alpine3.7/Dockerfile | 2 -- 2.7/alpine3.8/Dockerfile | 2 -- Dockerfile-caveman-alpine.template | 2 -- 4 files changed, 8 deletions(-) diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile index d314e545a..730804e6e 100644 --- a/2.7/alpine3.6/Dockerfile +++ b/2.7/alpine3.6/Dockerfile @@ -61,8 +61,6 @@ RUN set -ex \ tcl-dev \ tk \ tk-dev \ - util-linux-dev \ - xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile index 46784c3b5..24aaa9d2c 100644 --- a/2.7/alpine3.7/Dockerfile +++ b/2.7/alpine3.7/Dockerfile @@ -61,8 +61,6 @@ RUN set -ex \ tcl-dev \ tk \ tk-dev \ - util-linux-dev \ - xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ diff --git a/2.7/alpine3.8/Dockerfile b/2.7/alpine3.8/Dockerfile index 27a2745d1..8d5b06d6f 100644 --- a/2.7/alpine3.8/Dockerfile +++ b/2.7/alpine3.8/Dockerfile @@ -61,8 +61,6 @@ RUN set -ex \ tcl-dev \ tk \ tk-dev \ - util-linux-dev \ - xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \ diff --git a/Dockerfile-caveman-alpine.template b/Dockerfile-caveman-alpine.template index 0087e98c9..c8cdb62d7 100644 --- a/Dockerfile-caveman-alpine.template +++ b/Dockerfile-caveman-alpine.template @@ -57,8 +57,6 @@ RUN set -ex \ tcl-dev \ tk \ tk-dev \ - util-linux-dev \ - xz-dev \ zlib-dev \ # add build deps before removing fetch deps in case there's overlap && apk del .fetch-deps \