Skip to content

Commit cfe3b11

Browse files
authored
Merge pull request docker-library#125 from infosiftr/loadable-sqlite-extensions
Add "--enable-loadable-sqlite-extensions" for 3.x versions
2 parents 8a66fdc + 3db904b commit cfe3b11

File tree

18 files changed

+69
-38
lines changed

18 files changed

+69
-38
lines changed

2.7/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ RUN set -ex \
2727
&& rm python.tar.xz \
2828
\
2929
&& cd /usr/src/python \
30-
&& ./configure --enable-shared --enable-unicode=ucs4 \
30+
&& ./configure \
31+
--enable-shared \
32+
--enable-unicode=ucs4 \
3133
&& make -j$(nproc) \
3234
&& make install \
3335
&& ldconfig \

2.7/alpine/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 2.7.12
1313
ENV PYTHON_PIP_VERSION 8.1.2
1414

1515
RUN set -ex \
16-
&& apk add --no-cache --virtual .fetch-deps curl gnupg \
16+
&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
1717
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
1818
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
1919
&& export GNUPGHOME="$(mktemp -d)" \
2020
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
2121
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
2222
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
23-
&& mkdir -p /usr/src \
24-
&& tar -xJC /usr/src -f python.tar.xz \
25-
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
23+
&& mkdir -p /usr/src/python \
24+
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2625
&& rm python.tar.xz \
2726
\
2827
&& apk add --no-cache --virtual .build-deps \
@@ -38,7 +37,9 @@ RUN set -ex \
3837
sqlite-dev \
3938
zlib-dev \
4039
&& cd /usr/src/python \
41-
&& ./configure --enable-shared --enable-unicode=ucs4 \
40+
&& ./configure \
41+
--enable-shared \
42+
--enable-unicode=ucs4 \
4243
&& make -j$(getconf _NPROCESSORS_ONLN) \
4344
&& make install \
4445
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 \

2.7/slim/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ RUN set -ex \
4747
&& rm python.tar.xz \
4848
\
4949
&& cd /usr/src/python \
50-
&& ./configure --enable-shared --enable-unicode=ucs4 \
50+
&& ./configure \
51+
--enable-shared \
52+
--enable-unicode=ucs4 \
5153
&& make -j$(nproc) \
5254
&& make install \
5355
&& ldconfig \

2.7/wheezy/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ RUN set -ex \
2727
&& rm python.tar.xz \
2828
\
2929
&& cd /usr/src/python \
30-
&& ./configure --enable-shared --enable-unicode=ucs4 \
30+
&& ./configure \
31+
--enable-shared \
32+
--enable-unicode=ucs4 \
3133
&& make -j$(nproc) \
3234
&& make install \
3335
&& ldconfig \

3.3/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ RUN set -ex \
2727
&& rm python.tar.xz \
2828
\
2929
&& cd /usr/src/python \
30-
&& ./configure --enable-shared --enable-unicode=ucs4 \
30+
&& ./configure \
31+
--enable-loadable-sqlite-extensions \
32+
--enable-shared \
3133
&& make -j$(nproc) \
3234
&& make install \
3335
&& ldconfig \

3.3/alpine/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.3.6
1313
ENV PYTHON_PIP_VERSION 8.1.2
1414

1515
RUN set -ex \
16-
&& apk add --no-cache --virtual .fetch-deps curl gnupg \
16+
&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
1717
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
1818
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
1919
&& export GNUPGHOME="$(mktemp -d)" \
2020
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
2121
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
2222
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
23-
&& mkdir -p /usr/src \
24-
&& tar -xJC /usr/src -f python.tar.xz \
25-
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
23+
&& mkdir -p /usr/src/python \
24+
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2625
&& rm python.tar.xz \
2726
\
2827
&& apk add --no-cache --virtual .build-deps \
@@ -39,7 +38,9 @@ RUN set -ex \
3938
xz-dev \
4039
zlib-dev \
4140
&& cd /usr/src/python \
42-
&& ./configure --enable-shared --enable-unicode=ucs4 \
41+
&& ./configure \
42+
--enable-loadable-sqlite-extensions \
43+
--enable-shared \
4344
&& make -j$(getconf _NPROCESSORS_ONLN) \
4445
&& make install \
4546
&& curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python3 \

3.3/slim/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ RUN set -ex \
4848
&& rm python.tar.xz \
4949
\
5050
&& cd /usr/src/python \
51-
&& ./configure --enable-shared --enable-unicode=ucs4 \
51+
&& ./configure \
52+
--enable-loadable-sqlite-extensions \
53+
--enable-shared \
5254
&& make -j$(nproc) \
5355
&& make install \
5456
&& ldconfig \

3.3/wheezy/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ RUN set -ex \
2727
&& rm python.tar.xz \
2828
\
2929
&& cd /usr/src/python \
30-
&& ./configure --enable-shared --enable-unicode=ucs4 \
30+
&& ./configure \
31+
--enable-loadable-sqlite-extensions \
32+
--enable-shared \
3133
&& make -j$(nproc) \
3234
&& make install \
3335
&& ldconfig \

3.4/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ RUN set -ex \
2727
&& rm python.tar.xz \
2828
\
2929
&& cd /usr/src/python \
30-
&& ./configure --enable-shared --enable-unicode=ucs4 \
30+
&& ./configure \
31+
--enable-loadable-sqlite-extensions \
32+
--enable-shared \
3133
&& make -j$(nproc) \
3234
&& make install \
3335
&& ldconfig \

3.4/alpine/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ ENV PYTHON_VERSION 3.4.5
1313
ENV PYTHON_PIP_VERSION 8.1.2
1414

1515
RUN set -ex \
16-
&& apk add --no-cache --virtual .fetch-deps curl gnupg \
16+
&& apk add --no-cache --virtual .fetch-deps curl gnupg tar xz \
1717
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" -o python.tar.xz \
1818
&& curl -fSL "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" -o python.tar.xz.asc \
1919
&& export GNUPGHOME="$(mktemp -d)" \
2020
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
2121
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
2222
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
23-
&& mkdir -p /usr/src \
24-
&& tar -xJC /usr/src -f python.tar.xz \
25-
&& mv "/usr/src/Python-$PYTHON_VERSION" /usr/src/python \
23+
&& mkdir -p /usr/src/python \
24+
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
2625
&& rm python.tar.xz \
2726
&& apk del .fetch-deps \
2827
\
@@ -40,7 +39,9 @@ RUN set -ex \
4039
xz-dev \
4140
zlib-dev \
4241
&& cd /usr/src/python \
43-
&& ./configure --enable-shared --enable-unicode=ucs4 \
42+
&& ./configure \
43+
--enable-loadable-sqlite-extensions \
44+
--enable-shared \
4445
&& make -j$(getconf _NPROCESSORS_ONLN) \
4546
&& make install \
4647
&& pip3 install --no-cache-dir --upgrade pip==$PYTHON_PIP_VERSION \

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy