From ac647c4b59919136759da632acf231933e022492 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 6 Jul 2016 10:25:12 -0700
Subject: [PATCH 1/3] Reformat some minor whitespace and further shrink our
 alpine-debian diff

---
 2.7/Dockerfile        |  4 +++-
 2.7/alpine/Dockerfile | 11 ++++++-----
 2.7/slim/Dockerfile   |  4 +++-
 2.7/wheezy/Dockerfile |  4 +++-
 3.3/Dockerfile        |  4 +++-
 3.3/alpine/Dockerfile | 11 ++++++-----
 3.3/slim/Dockerfile   |  4 +++-
 3.3/wheezy/Dockerfile |  4 +++-
 3.4/Dockerfile        |  4 +++-
 3.4/alpine/Dockerfile | 11 ++++++-----
 3.4/slim/Dockerfile   |  4 +++-
 3.4/wheezy/Dockerfile |  4 +++-
 3.5/Dockerfile        |  4 +++-
 3.5/alpine/Dockerfile | 11 ++++++-----
 3.5/slim/Dockerfile   |  4 +++-
 3.6/Dockerfile        |  4 +++-
 3.6/alpine/Dockerfile | 11 ++++++-----
 3.6/slim/Dockerfile   |  4 +++-
 18 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/2.7/Dockerfile b/2.7/Dockerfile
index 8b8b9a44f..27b3d2c41 100644
--- a/2.7/Dockerfile
+++ b/2.7/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile
index f834cfe36..f7e62c533 100644
--- a/2.7/alpine/Dockerfile
+++ b/2.7/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 2.7.12
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
@@ -38,7 +37,9 @@ RUN set -ex \
 		sqlite-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \
diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile
index db6b006ff..0d0e5571b 100644
--- a/2.7/slim/Dockerfile
+++ b/2.7/slim/Dockerfile
@@ -47,7 +47,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile
index 57464a0a8..3673974ed 100644
--- a/2.7/wheezy/Dockerfile
+++ b/2.7/wheezy/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/Dockerfile b/3.3/Dockerfile
index 157dc24f9..b105c3add 100644
--- a/3.3/Dockerfile
+++ b/3.3/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile
index 50b63a0f3..4d2c9b698 100644
--- a/3.3/alpine/Dockerfile
+++ b/3.3/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.3.6
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
@@ -39,7 +38,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile
index 263c7ac5d..d3da36093 100644
--- a/3.3/slim/Dockerfile
+++ b/3.3/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile
index c79288798..8e48fb004 100644
--- a/3.3/wheezy/Dockerfile
+++ b/3.3/wheezy/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/Dockerfile b/3.4/Dockerfile
index 4f5d65d3f..9ec14f7af 100644
--- a/3.4/Dockerfile
+++ b/3.4/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile
index 8736bd733..0dd2b9ee7 100644
--- a/3.4/alpine/Dockerfile
+++ b/3.4/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.4.5
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	&& apk del .fetch-deps \
 	\
@@ -40,7 +39,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile
index dcca4534a..25ed11de1 100644
--- a/3.4/slim/Dockerfile
+++ b/3.4/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
index c668d32a3..6cbbd24b9 100644
--- a/3.4/wheezy/Dockerfile
+++ b/3.4/wheezy/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
index ceb718838..f0d7cbe73 100644
--- a/3.5/Dockerfile
+++ b/3.5/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile
index 41b9fe215..5f6cef040 100644
--- a/3.5/alpine/Dockerfile
+++ b/3.5/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.5.2
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	&& apk del .fetch-deps \
 	\
@@ -40,7 +39,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile
index 539a16d93..9cbbf6244 100644
--- a/3.5/slim/Dockerfile
+++ b/3.5/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.6/Dockerfile b/3.6/Dockerfile
index 2a57be95b..615e2609e 100644
--- a/3.6/Dockerfile
+++ b/3.6/Dockerfile
@@ -27,7 +27,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile
index 2f157f73d..6a8f7c84c 100644
--- a/3.6/alpine/Dockerfile
+++ b/3.6/alpine/Dockerfile
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.6.0a2
 ENV PYTHON_PIP_VERSION 8.1.2
 
 RUN set -ex \
-	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
+	&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
 	&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
 	&& export GNUPGHOME="$(mktemp -d)" \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
 	&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
 	&& rm -r "$GNUPGHOME" python.tar.xz.asc \
-	&& mkdir -p /usr/src \
-	&& tar -xJC /usr/src -f python.tar.xz \
-	&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
+	&& mkdir -p /usr/src/python \
+	&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
 	&& rm python.tar.xz \
 	&& apk del .fetch-deps \
 	\
@@ -40,7 +39,9 @@ RUN set -ex \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.6/slim/Dockerfile b/3.6/slim/Dockerfile
index c5328abbd..6830cd712 100644
--- a/3.6/slim/Dockerfile
+++ b/3.6/slim/Dockerfile
@@ -48,7 +48,9 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& ./configure --enable-shared --enable-unicode=ucs4 \
+	&& ./configure \
+		--enable-shared \
+		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \

From 96bef8d520ecf82e340d8c6843721bcbd1cc4cad Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 6 Jul 2016 11:07:10 -0700
Subject: [PATCH 2/3] Add "--enable-loadable-sqlite-extensions" for 3.x
 versions

---
 3.3/Dockerfile        | 1 +
 3.3/alpine/Dockerfile | 1 +
 3.3/slim/Dockerfile   | 1 +
 3.3/wheezy/Dockerfile | 1 +
 3.4/Dockerfile        | 1 +
 3.4/alpine/Dockerfile | 1 +
 3.4/slim/Dockerfile   | 1 +
 3.4/wheezy/Dockerfile | 1 +
 3.5/Dockerfile        | 1 +
 3.5/alpine/Dockerfile | 1 +
 3.5/slim/Dockerfile   | 1 +
 3.6/Dockerfile        | 1 +
 3.6/alpine/Dockerfile | 1 +
 3.6/slim/Dockerfile   | 1 +
 14 files changed, 14 insertions(+)

diff --git a/3.3/Dockerfile b/3.3/Dockerfile
index b105c3add..6e3aada90 100644
--- a/3.3/Dockerfile
+++ b/3.3/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile
index 4d2c9b698..e3d25e809 100644
--- a/3.3/alpine/Dockerfile
+++ b/3.3/alpine/Dockerfile
@@ -39,6 +39,7 @@ RUN set -ex \
 		zlib-dev \
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile
index d3da36093..284de5ef6 100644
--- a/3.3/slim/Dockerfile
+++ b/3.3/slim/Dockerfile
@@ -49,6 +49,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile
index 8e48fb004..775742c9b 100644
--- a/3.3/wheezy/Dockerfile
+++ b/3.3/wheezy/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.4/Dockerfile b/3.4/Dockerfile
index 9ec14f7af..abc41785d 100644
--- a/3.4/Dockerfile
+++ b/3.4/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile
index 0dd2b9ee7..7b2ebd842 100644
--- a/3.4/alpine/Dockerfile
+++ b/3.4/alpine/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex \
 		zlib-dev \
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile
index 25ed11de1..77b0effda 100644
--- a/3.4/slim/Dockerfile
+++ b/3.4/slim/Dockerfile
@@ -49,6 +49,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
index 6cbbd24b9..27474d341 100644
--- a/3.4/wheezy/Dockerfile
+++ b/3.4/wheezy/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
index f0d7cbe73..5a1790416 100644
--- a/3.5/Dockerfile
+++ b/3.5/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile
index 5f6cef040..93360b8f0 100644
--- a/3.5/alpine/Dockerfile
+++ b/3.5/alpine/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex \
 		zlib-dev \
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile
index 9cbbf6244..fcf6bd3c5 100644
--- a/3.5/slim/Dockerfile
+++ b/3.5/slim/Dockerfile
@@ -49,6 +49,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.6/Dockerfile b/3.6/Dockerfile
index 615e2609e..1e99babf9 100644
--- a/3.6/Dockerfile
+++ b/3.6/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile
index 6a8f7c84c..d4d8c5237 100644
--- a/3.6/alpine/Dockerfile
+++ b/3.6/alpine/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex \
 		zlib-dev \
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
diff --git a/3.6/slim/Dockerfile b/3.6/slim/Dockerfile
index 6830cd712..e3ae80b98 100644
--- a/3.6/slim/Dockerfile
+++ b/3.6/slim/Dockerfile
@@ -49,6 +49,7 @@ RUN set -ex \
 	\
 	&& cd /usr/src/python \
 	&& ./configure \
+		--enable-loadable-sqlite-extensions \
 		--enable-shared \
 		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \

From 3db904b3f5407840e591daf3aa54670a685b22b3 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 6 Jul 2016 11:10:20 -0700
Subject: [PATCH 3/3] configure: WARNING: unrecognized options:
 --enable-unicode

---
 3.3/Dockerfile        | 1 -
 3.3/alpine/Dockerfile | 1 -
 3.3/slim/Dockerfile   | 1 -
 3.3/wheezy/Dockerfile | 1 -
 3.4/Dockerfile        | 1 -
 3.4/alpine/Dockerfile | 1 -
 3.4/slim/Dockerfile   | 1 -
 3.4/wheezy/Dockerfile | 1 -
 3.5/Dockerfile        | 1 -
 3.5/alpine/Dockerfile | 1 -
 3.5/slim/Dockerfile   | 1 -
 3.6/Dockerfile        | 1 -
 3.6/alpine/Dockerfile | 1 -
 3.6/slim/Dockerfile   | 1 -
 14 files changed, 14 deletions(-)

diff --git a/3.3/Dockerfile b/3.3/Dockerfile
index 6e3aada90..2417f4b59 100644
--- a/3.3/Dockerfile
+++ b/3.3/Dockerfile
@@ -30,7 +30,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile
index e3d25e809..f081ebcf4 100644
--- a/3.3/alpine/Dockerfile
+++ b/3.3/alpine/Dockerfile
@@ -41,7 +41,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \
diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile
index 284de5ef6..9c5cfbc89 100644
--- a/3.3/slim/Dockerfile
+++ b/3.3/slim/Dockerfile
@@ -51,7 +51,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile
index 775742c9b..bae993ea8 100644
--- a/3.3/wheezy/Dockerfile
+++ b/3.3/wheezy/Dockerfile
@@ -30,7 +30,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/Dockerfile b/3.4/Dockerfile
index abc41785d..094a16b53 100644
--- a/3.4/Dockerfile
+++ b/3.4/Dockerfile
@@ -30,7 +30,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile
index 7b2ebd842..b4b71c0d2 100644
--- a/3.4/alpine/Dockerfile
+++ b/3.4/alpine/Dockerfile
@@ -42,7 +42,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile
index 77b0effda..c48f3eb0b 100644
--- a/3.4/slim/Dockerfile
+++ b/3.4/slim/Dockerfile
@@ -51,7 +51,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
index 27474d341..84603b437 100644
--- a/3.4/wheezy/Dockerfile
+++ b/3.4/wheezy/Dockerfile
@@ -30,7 +30,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
index 5a1790416..c88c9a9f9 100644
--- a/3.5/Dockerfile
+++ b/3.5/Dockerfile
@@ -30,7 +30,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile
index 93360b8f0..51a481936 100644
--- a/3.5/alpine/Dockerfile
+++ b/3.5/alpine/Dockerfile
@@ -42,7 +42,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile
index fcf6bd3c5..9e54379ac 100644
--- a/3.5/slim/Dockerfile
+++ b/3.5/slim/Dockerfile
@@ -51,7 +51,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.6/Dockerfile b/3.6/Dockerfile
index 1e99babf9..a75fde754 100644
--- a/3.6/Dockerfile
+++ b/3.6/Dockerfile
@@ -30,7 +30,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \
diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile
index d4d8c5237..6fdb503d5 100644
--- a/3.6/alpine/Dockerfile
+++ b/3.6/alpine/Dockerfile
@@ -42,7 +42,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
 	&& make install \
 	&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \
diff --git a/3.6/slim/Dockerfile b/3.6/slim/Dockerfile
index e3ae80b98..ac090f891 100644
--- a/3.6/slim/Dockerfile
+++ b/3.6/slim/Dockerfile
@@ -51,7 +51,6 @@ RUN set -ex \
 	&& ./configure \
 		--enable-loadable-sqlite-extensions \
 		--enable-shared \
-		--enable-unicode=ucs4 \
 	&& make -j$(nproc) \
 	&& make install \
 	&& ldconfig \