From 526ee08b34a8cd403ff47cc03001f8025738e70e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 26 May 2015 09:30:03 -0700 Subject: [PATCH] Update to 2.7.10 and update pip to 7.0.1 --- 2.7/Dockerfile | 4 ++-- 2.7/onbuild/Dockerfile | 2 +- 2.7/slim/Dockerfile | 4 ++-- 2.7/wheezy/Dockerfile | 4 ++-- 3.2/Dockerfile | 2 +- 3.2/slim/Dockerfile | 2 +- 3.2/wheezy/Dockerfile | 2 +- 3.3/Dockerfile | 2 +- 3.3/onbuild/Dockerfile | 2 +- 3.3/slim/Dockerfile | 2 +- 3.3/wheezy/Dockerfile | 2 +- 3.4/Dockerfile | 2 +- 3.4/onbuild/Dockerfile | 2 +- 3.4/slim/Dockerfile | 2 +- 3.4/wheezy/Dockerfile | 2 +- update.sh | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 1e2df42..ea957de 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -10,10 +10,10 @@ ENV LANG C.UTF-8 # gpg: key 18ADD4FF: public key "Benjamin Peterson " imported 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 ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/2.7/onbuild/Dockerfile b/2.7/onbuild/Dockerfile index b951c12..2ae9244 100644 --- a/2.7/onbuild/Dockerfile +++ b/2.7/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7.9 +FROM python:2.7 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile index 720c126..4de7304 100644 --- a/2.7/slim/Dockerfile +++ b/2.7/slim/Dockerfile @@ -16,10 +16,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # gpg: key 18ADD4FF: public key "Benjamin Peterson " imported 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 ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile index 6c2117d..12569eb 100644 --- a/2.7/wheezy/Dockerfile +++ b/2.7/wheezy/Dockerfile @@ -10,10 +10,10 @@ ENV LANG C.UTF-8 # gpg: key 18ADD4FF: public key "Benjamin Peterson " imported 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 ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 3078c22..dc592d8 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C ENV PYTHON_VERSION 3.2.6 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/3.2/slim/Dockerfile b/3.2/slim/Dockerfile index 0672d1d..0dbe732 100644 --- a/3.2/slim/Dockerfile +++ b/3.2/slim/Dockerfile @@ -19,7 +19,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C ENV PYTHON_VERSION 3.2.6 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ diff --git a/3.2/wheezy/Dockerfile b/3.2/wheezy/Dockerfile index 5cebf14..b6a9cfd 100644 --- a/3.2/wheezy/Dockerfile +++ b/3.2/wheezy/Dockerfile @@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C ENV PYTHON_VERSION 3.2.6 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/3.3/Dockerfile b/3.3/Dockerfile index 6060a88..53be5d8 100644 --- a/3.3/Dockerfile +++ b/3.3/Dockerfile @@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C ENV PYTHON_VERSION 3.3.6 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/3.3/onbuild/Dockerfile b/3.3/onbuild/Dockerfile index 6b7c60a..8830ded 100644 --- a/3.3/onbuild/Dockerfile +++ b/3.3/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.3.6 +FROM python:3.3 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile index fae09f2..63334db 100644 --- a/3.3/slim/Dockerfile +++ b/3.3/slim/Dockerfile @@ -19,7 +19,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C ENV PYTHON_VERSION 3.3.6 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile index 48a44fc..95ef65c 100644 --- a/3.3/wheezy/Dockerfile +++ b/3.3/wheezy/Dockerfile @@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 26DEA9D4613391EF3E25C ENV PYTHON_VERSION 3.3.6 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/3.4/Dockerfile b/3.4/Dockerfile index c0867e0..4823b63 100644 --- a/3.4/Dockerfile +++ b/3.4/Dockerfile @@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 97FC712E4C024BBEA48A6 ENV PYTHON_VERSION 3.4.3 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/3.4/onbuild/Dockerfile b/3.4/onbuild/Dockerfile index 4303cb8..318e95b 100644 --- a/3.4/onbuild/Dockerfile +++ b/3.4/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.4.3 +FROM python:3.4 RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile index b941ecc..0229736 100644 --- a/3.4/slim/Dockerfile +++ b/3.4/slim/Dockerfile @@ -19,7 +19,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 97FC712E4C024BBEA48A6 ENV PYTHON_VERSION 3.4.3 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && buildDeps='curl gcc libbz2-dev libc6-dev libsqlite3-dev libssl-dev make xz-utils zlib1g-dev' \ diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile index 0396f26..c460568 100644 --- a/3.4/wheezy/Dockerfile +++ b/3.4/wheezy/Dockerfile @@ -13,7 +13,7 @@ RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 97FC712E4C024BBEA48A6 ENV PYTHON_VERSION 3.4.3 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 7.0.0 +ENV PYTHON_PIP_VERSION 7.0.1 RUN set -x \ && mkdir -p /usr/src/python \ diff --git a/update.sh b/update.sh index 799c3dc..02e8d0e 100755 --- a/update.sh +++ b/update.sh @@ -22,6 +22,6 @@ for version in "${versions[@]}"; do s/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/; s/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/; ' "$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