Merge pull request #127 from jstewmon/tkinter

Install tk-dev and tcl-dev before building python
2016-07-19 09:50:17 -07:00 · 2016-07-19 09:50:17 -07:00 · 94652e72fc
parent cfe3b11c98 8d03a5036b
commit 94652e72fc
18 changed files with 100 additions and 0 deletions
--- a/2.7/Dockerfile
+++ b/2.7/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 2.7.12
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -42,6 +51,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # install "virtualenv", since the vast majority of users of this image will want it
--- a/2.7/alpine/Dockerfile
+++ b/2.7/alpine/Dockerfile
@ -35,6 +35,8 @@ RUN set -ex \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
+		tcl-dev \
+		tk-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
 	&& ./configure \
--- a/2.7/slim/Dockerfile
+++ b/2.7/slim/Dockerfile
@ -32,6 +32,8 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		tcl-dev \
+		tk-dev \
 		xz-utils \
 		zlib1g-dev \
 	' \
--- a/2.7/wheezy/Dockerfile
+++ b/2.7/wheezy/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 2.7.12
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -42,6 +51,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # install "virtualenv", since the vast majority of users of this image will want it
--- a/3.3/Dockerfile
+++ b/3.3/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 3.3.6
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -42,6 +51,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # make some useful symlinks that are expected to exist
--- a/3.3/alpine/Dockerfile
+++ b/3.3/alpine/Dockerfile
@ -35,6 +35,8 @@ RUN set -ex \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
+		tcl-dev \
+		tk-dev \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
--- a/3.3/slim/Dockerfile
+++ b/3.3/slim/Dockerfile
@ -33,6 +33,8 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		tcl-dev \
+		tk-dev \
 		xz-utils \
 		zlib1g-dev \
 	' \
--- a/3.3/wheezy/Dockerfile
+++ b/3.3/wheezy/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 3.3.6
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -42,6 +51,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # make some useful symlinks that are expected to exist
--- a/3.4/Dockerfile
+++ b/3.4/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 3.4.5
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -41,6 +50,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # make some useful symlinks that are expected to exist
--- a/3.4/alpine/Dockerfile
+++ b/3.4/alpine/Dockerfile
@ -36,6 +36,8 @@ RUN set -ex \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
+		tcl-dev \
+		tk-dev \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
--- a/3.4/slim/Dockerfile
+++ b/3.4/slim/Dockerfile
@ -33,6 +33,8 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		tcl-dev \
+		tk-dev \
 		xz-utils \
 		zlib1g-dev \
 	' \
--- a/3.4/wheezy/Dockerfile
+++ b/3.4/wheezy/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 3.4.5
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -41,6 +50,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # make some useful symlinks that are expected to exist
--- a/3.5/Dockerfile
+++ b/3.5/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 3.5.2
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -41,6 +50,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # make some useful symlinks that are expected to exist
--- a/3.5/alpine/Dockerfile
+++ b/3.5/alpine/Dockerfile
@ -36,6 +36,8 @@ RUN set -ex \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
+		tcl-dev \
+		tk-dev \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
--- a/3.5/slim/Dockerfile
+++ b/3.5/slim/Dockerfile
@ -33,6 +33,8 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		tcl-dev \
+		tk-dev \
 		xz-utils \
 		zlib1g-dev \
 	' \
--- a/3.6/Dockerfile
+++ b/3.6/Dockerfile
@ -16,6 +16,15 @@ ENV PYTHON_VERSION 3.6.0a2
 ENV PYTHON_PIP_VERSION 8.1.2

 RUN set -ex \
+	&& buildDeps=' \
+		tcl-dev \
+		tk-dev \
+	' \
+	&& runDeps=' \
+		tcl \
+		tk \
+	' \
+	&& apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& 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)" \
@ -41,6 +50,7 @@ RUN set -ex \
 		    -o \
 		    \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \
 		\) -exec rm -rf '{}' + \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -rf /usr/src/python ~/.cache

 # make some useful symlinks that are expected to exist
--- a/3.6/alpine/Dockerfile
+++ b/3.6/alpine/Dockerfile
@ -36,6 +36,8 @@ RUN set -ex \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
+		tcl-dev \
+		tk-dev \
 		xz-dev \
 		zlib-dev \
 	&& cd /usr/src/python \
--- a/3.6/slim/Dockerfile
+++ b/3.6/slim/Dockerfile
@ -33,6 +33,8 @@ RUN set -ex \
 		libsqlite3-dev \
 		libssl-dev \
 		make \
+		tcl-dev \
+		tk-dev \
 		xz-utils \
 		zlib1g-dev \
 	' \