Skip to content

Commit 84127f2

Browse files
J0WItianon
J0WI
authored and
tianon
committed
Add Debian Buster and remove Jessie
1 parent ccbc1f5 commit 84127f2

File tree

11 files changed

+471
-17
lines changed

11 files changed

+471
-17
lines changed

‎.travis.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ matrix:
1515
- os: windows
1616
dist: 1803-containers
1717
env: VERSION=3.7 VARIANT=windows/windowsservercore-1803
18+
- os: linux
19+
env: VERSION=3.7 VARIANT=buster
20+
- os: linux
21+
env: VERSION=3.7 VARIANT=buster/slim
1822
- os: linux
1923
env: VERSION=3.7 VARIANT=stretch
2024
- os: linux
@@ -23,6 +27,10 @@ matrix:
2327
env: VERSION=3.7 VARIANT=alpine3.10
2428
- os: linux
2529
env: VERSION=3.7 VARIANT=alpine3.9
30+
- os: linux
31+
env: VERSION=3.6 VARIANT=buster
32+
- os: linux
33+
env: VERSION=3.6 VARIANT=buster/slim
2634
- os: linux
2735
env: VERSION=3.6 VARIANT=stretch
2836
- os: linux
@@ -36,13 +44,13 @@ matrix:
3644
- os: linux
3745
env: VERSION=3.6 VARIANT=alpine3.9
3846
- os: linux
39-
env: VERSION=3.5 VARIANT=stretch
47+
env: VERSION=3.5 VARIANT=buster
4048
- os: linux
41-
env: VERSION=3.5 VARIANT=stretch/slim
49+
env: VERSION=3.5 VARIANT=buster/slim
4250
- os: linux
43-
env: VERSION=3.5 VARIANT=jessie
51+
env: VERSION=3.5 VARIANT=stretch
4452
- os: linux
45-
env: VERSION=3.5 VARIANT=jessie/slim
53+
env: VERSION=3.5 VARIANT=stretch/slim
4654
- os: linux
4755
env: VERSION=3.5 VARIANT=alpine3.10
4856
- os: linux
@@ -51,13 +59,13 @@ matrix:
5159
dist: 1803-containers
5260
env: VERSION=2.7 VARIANT=windows/windowsservercore-1803
5361
- os: linux
54-
env: VERSION=2.7 VARIANT=stretch
62+
env: VERSION=2.7 VARIANT=buster
5563
- os: linux
56-
env: VERSION=2.7 VARIANT=stretch/slim
64+
env: VERSION=2.7 VARIANT=buster/slim
5765
- os: linux
58-
env: VERSION=2.7 VARIANT=jessie
66+
env: VERSION=2.7 VARIANT=stretch
5967
- os: linux
60-
env: VERSION=2.7 VARIANT=jessie/slim
68+
env: VERSION=2.7 VARIANT=stretch/slim
6169
- os: linux
6270
env: VERSION=2.7 VARIANT=alpine3.10
6371
- os: linux

‎2.7/jessie/Dockerfile renamed to ‎2.7/buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM buildpack-deps:jessie
7+
FROM buildpack-deps:buster
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎2.7/jessie/slim/Dockerfile renamed to ‎2.7/buster/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM debian:jessie-slim
7+
FROM debian:buster-slim
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎3.5/jessie/Dockerfile renamed to ‎3.5/buster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM buildpack-deps:jessie
7+
FROM buildpack-deps:buster
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎3.5/jessie/slim/Dockerfile renamed to ‎3.5/buster/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM debian:jessie-slim
7+
FROM debian:buster-slim
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH

‎3.6/buster/Dockerfile

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM buildpack-deps:buster
8+
9+
# ensure local python is preferred over distribution python
10+
ENV PATH /usr/local/bin:$PATH
11+
12+
# http://bugs.python.org/issue19846
13+
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
14+
ENV LANG C.UTF-8
15+
16+
# extra dependencies (over what buildpack-deps already includes)
17+
RUN apt-get update && apt-get install -y --no-install-recommends \
18+
tk-dev \
19+
&& rm -rf /var/lib/apt/lists/*
20+
21+
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
22+
ENV PYTHON_VERSION 3.6.9
23+
24+
RUN set -ex \
25+
\
26+
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
27+
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
28+
&& export GNUPGHOME="$(mktemp -d)" \
29+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
30+
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
31+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
32+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
33+
&& mkdir -p /usr/src/python \
34+
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
35+
&& rm python.tar.xz \
36+
\
37+
&& cd /usr/src/python \
38+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
39+
&& ./configure \
40+
--build="$gnuArch" \
41+
--enable-loadable-sqlite-extensions \
42+
--enable-shared \
43+
--with-system-expat \
44+
--with-system-ffi \
45+
--without-ensurepip \
46+
&& make -j "$(nproc)" \
47+
&& make install \
48+
&& ldconfig \
49+
\
50+
&& find /usr/local -depth \
51+
\( \
52+
\( -type d -a \( -name test -o -name tests \) \) \
53+
-o \
54+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
55+
\) -exec rm -rf '{}' + \
56+
&& rm -rf /usr/src/python \
57+
\
58+
&& python3 --version
59+
60+
# make some useful symlinks that are expected to exist
61+
RUN cd /usr/local/bin \
62+
&& ln -s idle3 idle \
63+
&& ln -s pydoc3 pydoc \
64+
&& ln -s python3 python \
65+
&& ln -s python3-config python-config
66+
67+
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
68+
ENV PYTHON_PIP_VERSION 19.1.1
69+
70+
RUN set -ex; \
71+
\
72+
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
73+
\
74+
python get-pip.py \
75+
--disable-pip-version-check \
76+
--no-cache-dir \
77+
"pip==$PYTHON_PIP_VERSION" \
78+
; \
79+
pip --version; \
80+
\
81+
find /usr/local -depth \
82+
\( \
83+
\( -type d -a \( -name test -o -name tests \) \) \
84+
-o \
85+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
86+
\) -exec rm -rf '{}' +; \
87+
rm -f get-pip.py
88+
89+
CMD ["python3"]

‎3.6/buster/slim/Dockerfile

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM debian:buster-slim
8+
9+
# ensure local python is preferred over distribution python
10+
ENV PATH /usr/local/bin:$PATH
11+
12+
# http://bugs.python.org/issue19846
13+
# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
14+
ENV LANG C.UTF-8
15+
16+
# runtime dependencies
17+
RUN apt-get update && apt-get install -y --no-install-recommends \
18+
ca-certificates \
19+
netbase \
20+
&& rm -rf /var/lib/apt/lists/*
21+
22+
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
23+
ENV PYTHON_VERSION 3.6.9
24+
25+
RUN set -ex \
26+
\
27+
&& savedAptMark="$(apt-mark showmanual)" \
28+
&& apt-get update && apt-get install -y --no-install-recommends \
29+
dpkg-dev \
30+
gcc \
31+
libbz2-dev \
32+
libc6-dev \
33+
libexpat1-dev \
34+
libffi-dev \
35+
libgdbm-dev \
36+
liblzma-dev \
37+
libncursesw5-dev \
38+
libreadline-dev \
39+
libsqlite3-dev \
40+
libssl-dev \
41+
make \
42+
tk-dev \
43+
wget \
44+
xz-utils \
45+
zlib1g-dev \
46+
# as of Stretch, "gpg" is no longer included by default
47+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
48+
\
49+
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
50+
&& wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \
51+
&& export GNUPGHOME="$(mktemp -d)" \
52+
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
53+
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
54+
&& { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \
55+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
56+
&& mkdir -p /usr/src/python \
57+
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
58+
&& rm python.tar.xz \
59+
\
60+
&& cd /usr/src/python \
61+
&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
62+
&& ./configure \
63+
--build="$gnuArch" \
64+
--enable-loadable-sqlite-extensions \
65+
--enable-shared \
66+
--with-system-expat \
67+
--with-system-ffi \
68+
--without-ensurepip \
69+
&& make -j "$(nproc)" \
70+
&& make install \
71+
&& ldconfig \
72+
\
73+
&& apt-mark auto '.*' > /dev/null \
74+
&& apt-mark manual $savedAptMark \
75+
&& find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
76+
| awk '/=>/ { print $(NF-1) }' \
77+
| sort -u \
78+
| xargs -r dpkg-query --search \
79+
| cut -d: -f1 \
80+
| sort -u \
81+
| xargs -r apt-mark manual \
82+
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
83+
&& rm -rf /var/lib/apt/lists/* \
84+
\
85+
&& find /usr/local -depth \
86+
\( \
87+
\( -type d -a \( -name test -o -name tests \) \) \
88+
-o \
89+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
90+
\) -exec rm -rf '{}' + \
91+
&& rm -rf /usr/src/python \
92+
\
93+
&& python3 --version
94+
95+
# make some useful symlinks that are expected to exist
96+
RUN cd /usr/local/bin \
97+
&& ln -s idle3 idle \
98+
&& ln -s pydoc3 pydoc \
99+
&& ln -s python3 python \
100+
&& ln -s python3-config python-config
101+
102+
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
103+
ENV PYTHON_PIP_VERSION 19.1.1
104+
105+
RUN set -ex; \
106+
\
107+
savedAptMark="$(apt-mark showmanual)"; \
108+
apt-get update; \
109+
apt-get install -y --no-install-recommends wget; \
110+
\
111+
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
112+
\
113+
apt-mark auto '.*' > /dev/null; \
114+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
115+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
116+
rm -rf /var/lib/apt/lists/*; \
117+
\
118+
python get-pip.py \
119+
--disable-pip-version-check \
120+
--no-cache-dir \
121+
"pip==$PYTHON_PIP_VERSION" \
122+
; \
123+
pip --version; \
124+
\
125+
find /usr/local -depth \
126+
\( \
127+
\( -type d -a \( -name test -o -name tests \) \) \
128+
-o \
129+
\( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \
130+
\) -exec rm -rf '{}' +; \
131+
rm -f get-pip.py
132+
133+
CMD ["python3"]

0 commit comments

Comments
 (0)