Add 3.7.0a1 #223
Merged
Add 3.7.0a1 #223
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Here's a simpler diff: diff --git a/.appveyor.yml b/.appveyor.yml
index 94246cb..781b03f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,6 +3,8 @@ image: Visual Studio 2017
environment:
matrix:
+ - version: 3.7-rc
+ variant: windowsservercore
- version: 3.6
variant: windowsservercore
- version: 3.5
diff --git a/.travis.yml b/.travis.yml
index 74f6705..816c4b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ language: bash
services: docker
env:
+ - VERSION=3.7-rc VARIANT=stretch
+ - VERSION=3.7-rc VARIANT=stretch/slim
+ - VERSION=3.7-rc VARIANT=alpine3.6
- VERSION=3.6 VARIANT=stretch
- VERSION=3.6 VARIANT=jessie
- VERSION=3.6 VARIANT=jessie/slim
diff --git a/3.3/jessie/slim/Dockerfile b/3.3/jessie/slim/Dockerfile
index 21331c3..581f398 100644
--- a/3.3/jessie/slim/Dockerfile
+++ b/3.3/jessie/slim/Dockerfile
@@ -27,7 +27,7 @@ ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
ENV PYTHON_VERSION 3.3.7
RUN set -ex \
- && buildDeps=' \
+ && buildDeps=" \
dpkg-dev \
gcc \
libbz2-dev \
@@ -46,7 +46,9 @@ RUN set -ex \
wget \
xz-utils \
zlib1g-dev \
- ' \
+# as of Stretch, "gpg" is no longer included by default
+ $(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+ " \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
diff --git a/3.4/jessie/slim/Dockerfile b/3.4/jessie/slim/Dockerfile
index 1d3249b..45b78e1 100644
--- a/3.4/jessie/slim/Dockerfile
+++ b/3.4/jessie/slim/Dockerfile
@@ -27,7 +27,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
ENV PYTHON_VERSION 3.4.7
RUN set -ex \
- && buildDeps=' \
+ && buildDeps=" \
dpkg-dev \
gcc \
libbz2-dev \
@@ -46,7 +46,9 @@ RUN set -ex \
wget \
xz-utils \
zlib1g-dev \
- ' \
+# as of Stretch, "gpg" is no longer included by default
+ $(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+ " \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
diff --git a/3.5/jessie/slim/Dockerfile b/3.5/jessie/slim/Dockerfile
index c5d9d6b..663e600 100644
--- a/3.5/jessie/slim/Dockerfile
+++ b/3.5/jessie/slim/Dockerfile
@@ -27,7 +27,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
ENV PYTHON_VERSION 3.5.4
RUN set -ex \
- && buildDeps=' \
+ && buildDeps=" \
dpkg-dev \
gcc \
libbz2-dev \
@@ -46,7 +46,9 @@ RUN set -ex \
wget \
xz-utils \
zlib1g-dev \
- ' \
+# as of Stretch, "gpg" is no longer included by default
+ $(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+ " \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
diff --git a/3.6/jessie/slim/Dockerfile b/3.6/jessie/slim/Dockerfile
index 875233f..d51bb65 100644
--- a/3.6/jessie/slim/Dockerfile
+++ b/3.6/jessie/slim/Dockerfile
@@ -27,7 +27,7 @@ ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
ENV PYTHON_VERSION 3.6.2
RUN set -ex \
- && buildDeps=' \
+ && buildDeps=" \
dpkg-dev \
gcc \
libbz2-dev \
@@ -46,7 +46,9 @@ RUN set -ex \
wget \
xz-utils \
zlib1g-dev \
- ' \
+# as of Stretch, "gpg" is no longer included by default
+ $(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+ " \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
diff --git a/3.6/alpine3.6/Dockerfile b/3.7-rc/alpine3.6/Dockerfile
similarity index 99%
copy from 3.6/alpine3.6/Dockerfile
copy to 3.7-rc/alpine3.6/Dockerfile
index 52c5f53..f0d5f3f 100644
--- a/3.6/alpine3.6/Dockerfile
+++ b/3.7-rc/alpine3.6/Dockerfile
@@ -18,7 +18,7 @@ ENV LANG C.UTF-8
RUN apk add --no-cache ca-certificates
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
-ENV PYTHON_VERSION 3.6.2
+ENV PYTHON_VERSION 3.7.0a1
RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
diff --git a/3.6/stretch/Dockerfile b/3.7-rc/stretch/Dockerfile
similarity index 99%
copy from 3.6/stretch/Dockerfile
copy to 3.7-rc/stretch/Dockerfile
index c5a1375..807e04b 100644
--- a/3.6/stretch/Dockerfile
+++ b/3.7-rc/stretch/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
-ENV PYTHON_VERSION 3.6.2
+ENV PYTHON_VERSION 3.7.0a1
RUN set -ex \
&& buildDeps=' \
diff --git a/3.6/jessie/slim/Dockerfile b/3.7-rc/stretch/slim/Dockerfile
similarity index 93%
copy from 3.6/jessie/slim/Dockerfile
copy to 3.7-rc/stretch/slim/Dockerfile
index 875233f..fdbb193 100644
--- a/3.6/jessie/slim/Dockerfile
+++ b/3.7-rc/stretch/slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:jessie
+FROM debian:stretch
# ensure local python is preferred over distribution python
ENV PATH /usr/local/bin:$PATH
@@ -20,14 +20,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libffi6 \
libgdbm3 \
libsqlite3-0 \
- libssl1.0.0 \
+ libssl1.1 \
&& rm -rf /var/lib/apt/lists/*
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
-ENV PYTHON_VERSION 3.6.2
+ENV PYTHON_VERSION 3.7.0a1
RUN set -ex \
- && buildDeps=' \
+ && buildDeps=" \
dpkg-dev \
gcc \
libbz2-dev \
@@ -46,7 +46,9 @@ RUN set -ex \
wget \
xz-utils \
zlib1g-dev \
- ' \
+# as of Stretch, "gpg" is no longer included by default
+ $(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+ " \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
diff --git a/3.6/windows/windowsservercore/Dockerfile b/3.7-rc/windows/windowsservercore/Dockerfile
similarity index 97%
copy from 3.6/windows/windowsservercore/Dockerfile
copy to 3.7-rc/windows/windowsservercore/Dockerfile
index bba6dbf..b8be6c1 100644
--- a/3.6/windows/windowsservercore/Dockerfile
+++ b/3.7-rc/windows/windowsservercore/Dockerfile
@@ -8,8 +8,8 @@ FROM microsoft/windowsservercore
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
-ENV PYTHON_VERSION 3.6.2
-ENV PYTHON_RELEASE 3.6.2
+ENV PYTHON_VERSION 3.7.0a1
+ENV PYTHON_RELEASE 3.7.0
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
Write-Host ('Downloading {0} ...' -f $url); \
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
index 638baea..4c42232 100644
--- a/Dockerfile-slim.template
+++ b/Dockerfile-slim.template
@@ -14,14 +14,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libffi6 \
libgdbm3 \
libsqlite3-0 \
- libssl1.0.0 \
+ libssl1.1 \
&& rm -rf /var/lib/apt/lists/*
ENV GPG_KEY %%PLACEHOLDER%%
ENV PYTHON_VERSION %%PLACEHOLDER%%
RUN set -ex \
- && buildDeps=' \
+ && buildDeps=" \
dpkg-dev \
gcc \
libbz2-dev \
@@ -40,7 +40,9 @@ RUN set -ex \
wget \
xz-utils \
zlib1g-dev \
- ' \
+# as of Stretch, "gpg" is no longer included by default
+ $(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+ " \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
\
&& wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 8e87a7f..40a601f 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,7 +2,7 @@
set -Eeuo pipefail
declare -A aliases=(
- [3.6-rc]='rc'
+ [3.7-rc]='rc'
[3.6]='3 latest'
[2.7]='2'
)
diff --git a/update.sh b/update.sh
index 30dcedd..836323f 100755
--- a/update.sh
+++ b/update.sh
@@ -22,6 +22,10 @@ declare -A gpgKeys=(
# gpg: key AA65421D: public key "Ned Deily (Python release signing key) <[email protected]>" imported
[3.6]='0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D'
# https://www.python.org/dev/peps/pep-0494/#release-manager-and-crew
+
+ # gpg: key AA65421D: public key "Ned Deily (Python release signing key) <[email protected]>" imported
+ [3.7]='0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D'
+ # https://www.python.org/dev/peps/pep-0494/#release-manager-and-crew
)
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -54,7 +58,19 @@ for version in "${versions[@]}"; do
rcGrepV=
fi
- possibles=( $(curl -fsSL 'https://www.python.org/ftp/python/' | grep '<a href="'"$rcVersion." | sed -r 's!.*<a href="([^"/]+)/?".*!\1!' | sort -rV) )
+ possibles=( $(
+ {
+ git ls-remote --tags https://github.com/python/cpython.git "refs/tags/v${rcVersion}.*" \
+ | sed -r 's!^.*refs/tags/v([0-9.]+).*$!\1!' \
+ || :
+
+ # this page has a very aggressive varnish cache in front of it, which is why we also scrape tags from GitHub
+ curl -fsSL 'https://www.python.org/ftp/python/' \
+ | grep '<a href="'"$rcVersion." \
+ | sed -r 's!.*<a href="([^"/]+)/?".*!\1!' \
+ || :
+ } | sort -ruV
+ ) )
fullVersion=
for possible in "${possibles[@]}"; do
possibleVersions=( $(
@@ -122,6 +138,12 @@ for version in "${versions[@]}"; do
esac
case "$v" in
+ wheezy/slim|jessie/slim)
+ sed -ri -e 's/libssl1.1/libssl1.0.0/g' "$dir/Dockerfile"
+ ;;
+ esac
+
+ case "$v" in
*/onbuild) ;;
windows/*)
appveyorEnv='\n - version: '"$version"'\n variant: '"$variant$appveyorEnv" |
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Sep 20, 2017
- `drupal`: 8.4.0-rc2 - `nextcloud`: 11.0.5, 12.0.3 - `php`: extra info text (docker-library/php#497) - `piwik`: 3.1.1 - `python`: 3.7.0a1 (docker-library/python#223), `SharedTags` (docker-library/python#224) - `tomcat`: 8.5.21, 9.0.0.M27 - `wordpress`: 4.8.2
tao12345666333
pushed a commit
to tao12345666333/python
that referenced
this pull request
Jun 28, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.