Update to 2.7.10 and update pip to 7.0.1

This commit is contained in:
Tianon Gravi 2015-05-26 09:30:03 -07:00
parent d03644b6e2
commit 526ee08b34
16 changed files with 19 additions and 19 deletions

View File

@ -10,10 +10,10 @@ ENV LANG C.UTF-8
# gpg: key 18ADD4FF: public key "Benjamin Peterson <benjamin@python.org>" imported # gpg: key 18ADD4FF: public key "Benjamin Peterson <benjamin@python.org>" imported
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
ENV PYTHON_VERSION 2.7.9 ENV PYTHON_VERSION 2.7.10
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -1,4 +1,4 @@
FROM python:2.7.9 FROM python:2.7
RUN mkdir -p /usr/src/app RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app

View File

@ -16,10 +16,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
# gpg: key 18ADD4FF: public key "Benjamin Peterson <benjamin@python.org>" imported # gpg: key 18ADD4FF: public key "Benjamin Peterson <benjamin@python.org>" imported
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
ENV PYTHON_VERSION 2.7.9 ENV PYTHON_VERSION 2.7.10
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \

View File

@ -10,10 +10,10 @@ ENV LANG C.UTF-8
# gpg: key 18ADD4FF: public key "Benjamin Peterson <benjamin@python.org>" imported # gpg: key 18ADD4FF: public key "Benjamin Peterson <benjamin@python.org>" imported
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
ENV PYTHON_VERSION 2.7.9 ENV PYTHON_VERSION 2.7.10
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C
ENV PYTHON_VERSION 3.2.6 ENV PYTHON_VERSION 3.2.6
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -19,7 +19,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C
ENV PYTHON_VERSION 3.2.6 ENV PYTHON_VERSION 3.2.6
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \

View File

@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C
ENV PYTHON_VERSION 3.2.6 ENV PYTHON_VERSION 3.2.6
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C
ENV PYTHON_VERSION 3.3.6 ENV PYTHON_VERSION 3.3.6
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -1,4 +1,4 @@
FROM python:3.3.6 FROM python:3.3
RUN mkdir -p /usr/src/app RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app

View File

@ -19,7 +19,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C
ENV PYTHON_VERSION 3.3.6 ENV PYTHON_VERSION 3.3.6
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \

View File

@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C
ENV PYTHON_VERSION 3.3.6 ENV PYTHON_VERSION 3.3.6
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 97FC712E4C024BBEA48A6
ENV PYTHON_VERSION 3.4.3 ENV PYTHON_VERSION 3.4.3
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -1,4 +1,4 @@
FROM python:3.4.3 FROM python:3.4
RUN mkdir -p /usr/src/app RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app

View File

@ -19,7 +19,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 97FC712E4C024BBEA48A6
ENV PYTHON_VERSION 3.4.3 ENV PYTHON_VERSION 3.4.3
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \

View File

@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 97FC712E4C024BBEA48A6
ENV PYTHON_VERSION 3.4.3 ENV PYTHON_VERSION 3.4.3
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'" # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 7.0.0 ENV PYTHON_PIP_VERSION 7.0.1
RUN set -x \ RUN set -x \
&& mkdir -p /usr/src/python \ && mkdir -p /usr/src/python \

View File

@ -22,6 +22,6 @@ for version in "${versions[@]}"; do
s/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/; s/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/;
s/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/; s/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/;
' "$version"/{,slim/,wheezy/}Dockerfile ' "$version"/{,slim/,wheezy/}Dockerfile
sed -ri 's/^(FROM python):.*/\1:'"$fullVersion"'/' "$version/onbuild/Dockerfile" sed -ri 's/^(FROM python):.*/\1:'"$version"'/' "$version/onbuild/Dockerfile"
) )
done done