Merge pull request docker-library#653 from timgates42/3.10

yosifkit · web-flow · commit f9647a560763 · 2021-10-05T14:59:09.000-07:00
Update to 3.10.0 (GA)
diff --git a/3.10/alpine3.13/Dockerfile b/3.10/alpine3.13/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 # other runtime dependencies for Python are installed later
 
 ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps \
diff --git a/3.10/alpine3.14/Dockerfile b/3.10/alpine3.14/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 # other runtime dependencies for Python are installed later
 
 ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps \
diff --git a/3.10/bullseye/Dockerfile b/3.10/bullseye/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 
 RUN set -ex \
 	\
diff --git a/3.10/bullseye/slim/Dockerfile b/3.10/bullseye/slim/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 
 RUN set -ex \
 	\
diff --git a/3.10/buster/Dockerfile b/3.10/buster/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 
 RUN set -ex \
 	\
diff --git a/3.10/buster/slim/Dockerfile b/3.10/buster/slim/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 
 RUN set -ex \
 	\
diff --git a/3.10/windows/windowsservercore-1809/Dockerfile b/3.10/windows/windowsservercore-1809/Dockerfile
@@ -11,7 +11,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 # https://github.com/docker-library/python/pull/557
 ENV PYTHONIOENCODING UTF-8
 
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 ENV PYTHON_RELEASE 3.10.0
 
 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
diff --git a/3.10/windows/windowsservercore-ltsc2016/Dockerfile b/3.10/windows/windowsservercore-ltsc2016/Dockerfile
@@ -11,7 +11,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 # https://github.com/docker-library/python/pull/557
 ENV PYTHONIOENCODING UTF-8
 
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 ENV PYTHON_RELEASE 3.10.0
 
 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
diff --git a/3.10/windows/windowsservercore-ltsc2022/Dockerfile b/3.10/windows/windowsservercore-ltsc2022/Dockerfile
@@ -11,7 +11,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 # https://github.com/docker-library/python/pull/557
 ENV PYTHONIOENCODING UTF-8
 
-ENV PYTHON_VERSION 3.10.0rc2
+ENV PYTHON_VERSION 3.10.0
 ENV PYTHON_RELEASE 3.10.0
 
 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -2,8 +2,8 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[3.10-rc]='rc'
-	[3.9]='3 latest'
+	[3.11-rc]='rc'
+	[3.10]='3 latest'
 )
 
 defaultDebianSuite='bullseye'

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \`
`21`	`21`	`&& rm -rf /var/lib/apt/lists/*`
`22`	`22`
`23`	`23`	`ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D`
`24`		`-ENV PYTHON_VERSION 3.10.0rc2`
	`24`	`+ENV PYTHON_VERSION 3.10.0`
`25`	`25`
`26`	`26`	`RUN set -ex \`
`27`	`27`	`\`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ RUN set -eux; \`
`24`	`24`	`rm -rf /var/lib/apt/lists/*`
`25`	`25`
`26`	`26`	`ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D`
`27`		`-ENV PYTHON_VERSION 3.10.0rc2`
	`27`	`+ENV PYTHON_VERSION 3.10.0`
`28`	`28`
`29`	`29`	`RUN set -ex \`
`30`	`30`	`\`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`set -Eeuo pipefail`
`3`	`3`
`4`	`4`	`declare -A aliases=(`
`5`		`- [3.10-rc]='rc'`
`6`		`- [3.9]='3 latest'`
	`5`	`+ [3.11-rc]='rc'`
	`6`	`+ [3.10]='3 latest'`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`defaultDebianSuite='bullseye'`