From f12c2df135aef8c3f645d90aae582b2c65dbc3b5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 27 Sep 2017 07:26:57 -0700 Subject: [PATCH] Fix onbuild FROM values --- 2.7/jessie/onbuild/Dockerfile | 2 +- 3.3/jessie/onbuild/Dockerfile | 2 +- 3.4/jessie/onbuild/Dockerfile | 2 +- 3.5/jessie/onbuild/Dockerfile | 2 +- 3.6/jessie/onbuild/Dockerfile | 2 +- update.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2.7/jessie/onbuild/Dockerfile b/2.7/jessie/onbuild/Dockerfile index 304d79a05..bd3a84cd5 100644 --- a/2.7/jessie/onbuild/Dockerfile +++ b/2.7/jessie/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7 +FROM python:2.7-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/3.3/jessie/onbuild/Dockerfile b/3.3/jessie/onbuild/Dockerfile index bc96d2fc7..a0d1ba355 100644 --- a/3.3/jessie/onbuild/Dockerfile +++ b/3.3/jessie/onbuild/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.3 +FROM python:3.3-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/3.4/jessie/onbuild/Dockerfile b/3.4/jessie/onbuild/Dockerfile index 892c9c321..e3e277030 100644 --- a/3.4/jessie/onbuild/Dockerfile +++ b/3.4/jessie/onbuild/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.4 +FROM python:3.4-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/3.5/jessie/onbuild/Dockerfile b/3.5/jessie/onbuild/Dockerfile index 45b1f2a39..0bdfcfafc 100644 --- a/3.5/jessie/onbuild/Dockerfile +++ b/3.5/jessie/onbuild/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.5 +FROM python:3.5-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/3.6/jessie/onbuild/Dockerfile b/3.6/jessie/onbuild/Dockerfile index ec9f39f4d..eab31f7c8 100644 --- a/3.6/jessie/onbuild/Dockerfile +++ b/3.6/jessie/onbuild/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM python:3.6 +FROM python:3.6-jessie RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/update.sh b/update.sh index 836323fca..62bd086ea 100755 --- a/update.sh +++ b/update.sh @@ -128,7 +128,7 @@ for version in "${versions[@]}"; do -e 's/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/' \ -e 's/^(ENV PYTHON_RELEASE) .*/\1 '"${fullVersion%%[a-z]*}"'/' \ -e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/' \ - -e 's/^(FROM python):.*/\1:'"$version"'/' \ + -e 's/^(FROM python):.*/\1:'"$version-$tag"'/' \ -e 's/^(FROM (debian|buildpack-deps|alpine)):.*/\1:'"$tag"'/' \ "$dir/Dockerfile"