Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pypy #11995

Merged
merged 1 commit into from
Mar 8, 2022
Merged

Update pypy #11995

merged 1 commit into from
Mar 8, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 8, 2022

Changes:

Changes:

- docker-library/pypy@36b9c5c: Merge pull request docker-library/pypy#74 from infosiftr/windows-ltsc2022
- docker-library/pypy@b79550a: Add Windows LTSC 2022
@github-actions
Copy link

github-actions bot commented Mar 8, 2022

Diff for 6154dc9:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7fe5304..74660ca 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -29,6 +29,13 @@ GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 2.7/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
+Tags: 2.7-7.3.8-windowsservercore-ltsc2022, 2.7-7.3-windowsservercore-ltsc2022, 2.7-7-windowsservercore-ltsc2022, 2.7-windowsservercore-ltsc2022, 2-7.3.8-windowsservercore-ltsc2022, 2-7.3-windowsservercore-ltsc2022, 2-7-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022
+SharedTags: 2.7-7.3.8, 2.7-7.3, 2.7-7, 2.7, 2-7.3.8, 2-7.3, 2-7, 2, 2.7-7.3.8-windowsservercore, 2.7-7.3-windowsservercore, 2.7-7-windowsservercore, 2.7-windowsservercore, 2-7.3.8-windowsservercore, 2-7.3-windowsservercore, 2-7-windowsservercore, 2-windowsservercore
+Architectures: windows-amd64
+GitCommit: b79550ad7b1df65b7ab16d3b0aaee0488468d603
+Directory: 2.7/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 3.7-7.3.8-bullseye, 3.7-7.3-bullseye, 3.7-7-bullseye, 3.7-bullseye
 SharedTags: 3.7-7.3.8, 3.7-7.3, 3.7-7, 3.7
 Architectures: amd64, arm64v8, i386
@@ -57,6 +64,13 @@ GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.7/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
+Tags: 3.7-7.3.8-windowsservercore-ltsc2022, 3.7-7.3-windowsservercore-ltsc2022, 3.7-7-windowsservercore-ltsc2022, 3.7-windowsservercore-ltsc2022
+SharedTags: 3.7-7.3.8, 3.7-7.3, 3.7-7, 3.7, 3.7-7.3.8-windowsservercore, 3.7-7.3-windowsservercore, 3.7-7-windowsservercore, 3.7-windowsservercore
+Architectures: windows-amd64
+GitCommit: b79550ad7b1df65b7ab16d3b0aaee0488468d603
+Directory: 3.7/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 3.8-7.3.8-bullseye, 3.8-7.3-bullseye, 3.8-7-bullseye, 3.8-bullseye, 3-7.3.8-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
 SharedTags: 3.8-7.3.8, 3.8-7.3, 3.8-7, 3.8, 3-7.3.8, 3-7.3, 3-7, 3, latest
 Architectures: amd64, arm64v8, i386
@@ -85,6 +99,13 @@ GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.8/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
+Tags: 3.8-7.3.8-windowsservercore-ltsc2022, 3.8-7.3-windowsservercore-ltsc2022, 3.8-7-windowsservercore-ltsc2022, 3.8-windowsservercore-ltsc2022, 3-7.3.8-windowsservercore-ltsc2022, 3-7.3-windowsservercore-ltsc2022, 3-7-windowsservercore-ltsc2022, 3-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 3.8-7.3.8, 3.8-7.3, 3.8-7, 3.8, 3-7.3.8, 3-7.3, 3-7, 3, latest, 3.8-7.3.8-windowsservercore, 3.8-7.3-windowsservercore, 3.8-7-windowsservercore, 3.8-windowsservercore, 3-7.3.8-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
+Architectures: windows-amd64
+GitCommit: b79550ad7b1df65b7ab16d3b0aaee0488468d603
+Directory: 3.8/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
+
 Tags: 3.9-7.3.8-bullseye, 3.9-7.3-bullseye, 3.9-7-bullseye, 3.9-bullseye
 SharedTags: 3.9-7.3.8, 3.9-7.3, 3.9-7, 3.9
 Architectures: amd64, arm64v8, i386
@@ -112,3 +133,10 @@ Architectures: windows-amd64
 GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.9/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
+
+Tags: 3.9-7.3.8-windowsservercore-ltsc2022, 3.9-7.3-windowsservercore-ltsc2022, 3.9-7-windowsservercore-ltsc2022, 3.9-windowsservercore-ltsc2022
+SharedTags: 3.9-7.3.8, 3.9-7.3, 3.9-7, 3.9, 3.9-7.3.8-windowsservercore, 3.9-7.3-windowsservercore, 3.9-7-windowsservercore, 3.9-windowsservercore
+Architectures: windows-amd64
+GitCommit: b79550ad7b1df65b7ab16d3b0aaee0488468d603
+Directory: 3.9/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 4060147..7dcbe03 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -7,6 +7,7 @@ pypy:2-7-slim-bullseye
 pypy:2-7-slim-buster
 pypy:2-7-windowsservercore
 pypy:2-7-windowsservercore-1809
+pypy:2-7-windowsservercore-ltsc2022
 pypy:2-7.3
 pypy:2-7.3-bullseye
 pypy:2-7.3-buster
@@ -15,6 +16,7 @@ pypy:2-7.3-slim-bullseye
 pypy:2-7.3-slim-buster
 pypy:2-7.3-windowsservercore
 pypy:2-7.3-windowsservercore-1809
+pypy:2-7.3-windowsservercore-ltsc2022
 pypy:2-7.3.8
 pypy:2-7.3.8-bullseye
 pypy:2-7.3.8-buster
@@ -23,6 +25,7 @@ pypy:2-7.3.8-slim-bullseye
 pypy:2-7.3.8-slim-buster
 pypy:2-7.3.8-windowsservercore
 pypy:2-7.3.8-windowsservercore-1809
+pypy:2-7.3.8-windowsservercore-ltsc2022
 pypy:2-bullseye
 pypy:2-buster
 pypy:2-slim
@@ -30,6 +33,7 @@ pypy:2-slim-bullseye
 pypy:2-slim-buster
 pypy:2-windowsservercore
 pypy:2-windowsservercore-1809
+pypy:2-windowsservercore-ltsc2022
 pypy:2.7
 pypy:2.7-7
 pypy:2.7-7-bullseye
@@ -39,6 +43,7 @@ pypy:2.7-7-slim-bullseye
 pypy:2.7-7-slim-buster
 pypy:2.7-7-windowsservercore
 pypy:2.7-7-windowsservercore-1809
+pypy:2.7-7-windowsservercore-ltsc2022
 pypy:2.7-7.3
 pypy:2.7-7.3-bullseye
 pypy:2.7-7.3-buster
@@ -47,6 +52,7 @@ pypy:2.7-7.3-slim-bullseye
 pypy:2.7-7.3-slim-buster
 pypy:2.7-7.3-windowsservercore
 pypy:2.7-7.3-windowsservercore-1809
+pypy:2.7-7.3-windowsservercore-ltsc2022
 pypy:2.7-7.3.8
 pypy:2.7-7.3.8-bullseye
 pypy:2.7-7.3.8-buster
@@ -55,6 +61,7 @@ pypy:2.7-7.3.8-slim-bullseye
 pypy:2.7-7.3.8-slim-buster
 pypy:2.7-7.3.8-windowsservercore
 pypy:2.7-7.3.8-windowsservercore-1809
+pypy:2.7-7.3.8-windowsservercore-ltsc2022
 pypy:2.7-bullseye
 pypy:2.7-buster
 pypy:2.7-slim
@@ -62,6 +69,7 @@ pypy:2.7-slim-bullseye
 pypy:2.7-slim-buster
 pypy:2.7-windowsservercore
 pypy:2.7-windowsservercore-1809
+pypy:2.7-windowsservercore-ltsc2022
 pypy:3
 pypy:3-7
 pypy:3-7-bullseye
@@ -71,6 +79,7 @@ pypy:3-7-slim-bullseye
 pypy:3-7-slim-buster
 pypy:3-7-windowsservercore
 pypy:3-7-windowsservercore-1809
+pypy:3-7-windowsservercore-ltsc2022
 pypy:3-7.3
 pypy:3-7.3-bullseye
 pypy:3-7.3-buster
@@ -79,6 +88,7 @@ pypy:3-7.3-slim-bullseye
 pypy:3-7.3-slim-buster
 pypy:3-7.3-windowsservercore
 pypy:3-7.3-windowsservercore-1809
+pypy:3-7.3-windowsservercore-ltsc2022
 pypy:3-7.3.8
 pypy:3-7.3.8-bullseye
 pypy:3-7.3.8-buster
@@ -87,6 +97,7 @@ pypy:3-7.3.8-slim-bullseye
 pypy:3-7.3.8-slim-buster
 pypy:3-7.3.8-windowsservercore
 pypy:3-7.3.8-windowsservercore-1809
+pypy:3-7.3.8-windowsservercore-ltsc2022
 pypy:3-bullseye
 pypy:3-buster
 pypy:3-slim
@@ -94,6 +105,7 @@ pypy:3-slim-bullseye
 pypy:3-slim-buster
 pypy:3-windowsservercore
 pypy:3-windowsservercore-1809
+pypy:3-windowsservercore-ltsc2022
 pypy:3.7
 pypy:3.7-7
 pypy:3.7-7-bullseye
@@ -103,6 +115,7 @@ pypy:3.7-7-slim-bullseye
 pypy:3.7-7-slim-buster
 pypy:3.7-7-windowsservercore
 pypy:3.7-7-windowsservercore-1809
+pypy:3.7-7-windowsservercore-ltsc2022
 pypy:3.7-7.3
 pypy:3.7-7.3-bullseye
 pypy:3.7-7.3-buster
@@ -111,6 +124,7 @@ pypy:3.7-7.3-slim-bullseye
 pypy:3.7-7.3-slim-buster
 pypy:3.7-7.3-windowsservercore
 pypy:3.7-7.3-windowsservercore-1809
+pypy:3.7-7.3-windowsservercore-ltsc2022
 pypy:3.7-7.3.8
 pypy:3.7-7.3.8-bullseye
 pypy:3.7-7.3.8-buster
@@ -119,6 +133,7 @@ pypy:3.7-7.3.8-slim-bullseye
 pypy:3.7-7.3.8-slim-buster
 pypy:3.7-7.3.8-windowsservercore
 pypy:3.7-7.3.8-windowsservercore-1809
+pypy:3.7-7.3.8-windowsservercore-ltsc2022
 pypy:3.7-bullseye
 pypy:3.7-buster
 pypy:3.7-slim
@@ -126,6 +141,7 @@ pypy:3.7-slim-bullseye
 pypy:3.7-slim-buster
 pypy:3.7-windowsservercore
 pypy:3.7-windowsservercore-1809
+pypy:3.7-windowsservercore-ltsc2022
 pypy:3.8
 pypy:3.8-7
 pypy:3.8-7-bullseye
@@ -135,6 +151,7 @@ pypy:3.8-7-slim-bullseye
 pypy:3.8-7-slim-buster
 pypy:3.8-7-windowsservercore
 pypy:3.8-7-windowsservercore-1809
+pypy:3.8-7-windowsservercore-ltsc2022
 pypy:3.8-7.3
 pypy:3.8-7.3-bullseye
 pypy:3.8-7.3-buster
@@ -143,6 +160,7 @@ pypy:3.8-7.3-slim-bullseye
 pypy:3.8-7.3-slim-buster
 pypy:3.8-7.3-windowsservercore
 pypy:3.8-7.3-windowsservercore-1809
+pypy:3.8-7.3-windowsservercore-ltsc2022
 pypy:3.8-7.3.8
 pypy:3.8-7.3.8-bullseye
 pypy:3.8-7.3.8-buster
@@ -151,6 +169,7 @@ pypy:3.8-7.3.8-slim-bullseye
 pypy:3.8-7.3.8-slim-buster
 pypy:3.8-7.3.8-windowsservercore
 pypy:3.8-7.3.8-windowsservercore-1809
+pypy:3.8-7.3.8-windowsservercore-ltsc2022
 pypy:3.8-bullseye
 pypy:3.8-buster
 pypy:3.8-slim
@@ -158,6 +177,7 @@ pypy:3.8-slim-bullseye
 pypy:3.8-slim-buster
 pypy:3.8-windowsservercore
 pypy:3.8-windowsservercore-1809
+pypy:3.8-windowsservercore-ltsc2022
 pypy:3.9
 pypy:3.9-7
 pypy:3.9-7-bullseye
@@ -167,6 +187,7 @@ pypy:3.9-7-slim-bullseye
 pypy:3.9-7-slim-buster
 pypy:3.9-7-windowsservercore
 pypy:3.9-7-windowsservercore-1809
+pypy:3.9-7-windowsservercore-ltsc2022
 pypy:3.9-7.3
 pypy:3.9-7.3-bullseye
 pypy:3.9-7.3-buster
@@ -175,6 +196,7 @@ pypy:3.9-7.3-slim-bullseye
 pypy:3.9-7.3-slim-buster
 pypy:3.9-7.3-windowsservercore
 pypy:3.9-7.3-windowsservercore-1809
+pypy:3.9-7.3-windowsservercore-ltsc2022
 pypy:3.9-7.3.8
 pypy:3.9-7.3.8-bullseye
 pypy:3.9-7.3.8-buster
@@ -183,6 +205,7 @@ pypy:3.9-7.3.8-slim-bullseye
 pypy:3.9-7.3.8-slim-buster
 pypy:3.9-7.3.8-windowsservercore
 pypy:3.9-7.3.8-windowsservercore-1809
+pypy:3.9-7.3.8-windowsservercore-ltsc2022
 pypy:3.9-bullseye
 pypy:3.9-buster
 pypy:3.9-slim
@@ -190,6 +213,7 @@ pypy:3.9-slim-bullseye
 pypy:3.9-slim-buster
 pypy:3.9-windowsservercore
 pypy:3.9-windowsservercore-1809
+pypy:3.9-windowsservercore-ltsc2022
 pypy:bullseye
 pypy:buster
 pypy:latest
@@ -198,3 +222,4 @@ pypy:slim-bullseye
 pypy:slim-buster
 pypy:windowsservercore
 pypy:windowsservercore-1809
+pypy:windowsservercore-ltsc2022
diff --git a/pypy_2-windowsservercore-1809/Dockerfile b/pypy_2-windowsservercore-ltsc2022/Dockerfile
similarity index 98%
copy from pypy_2-windowsservercore-1809/Dockerfile
copy to pypy_2-windowsservercore-ltsc2022/Dockerfile
index f2af8c8..fb63c66 100644
--- a/pypy_2-windowsservercore-1809/Dockerfile
+++ b/pypy_2-windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/pypy_3.7-windowsservercore-1809/Dockerfile b/pypy_3.7-windowsservercore-ltsc2022/Dockerfile
similarity index 98%
copy from pypy_3.7-windowsservercore-1809/Dockerfile
copy to pypy_3.7-windowsservercore-ltsc2022/Dockerfile
index dda76ad..8247221 100644
--- a/pypy_3.7-windowsservercore-1809/Dockerfile
+++ b/pypy_3.7-windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/pypy_3.9-windowsservercore-1809/Dockerfile b/pypy_3.9-windowsservercore-ltsc2022/Dockerfile
similarity index 98%
copy from pypy_3.9-windowsservercore-1809/Dockerfile
copy to pypy_3.9-windowsservercore-ltsc2022/Dockerfile
index a8e59fe..9e316c9 100644
--- a/pypy_3.9-windowsservercore-1809/Dockerfile
+++ b/pypy_3.9-windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/pypy_windowsservercore-1809/Dockerfile b/pypy_windowsservercore-ltsc2022/Dockerfile
similarity index 98%
copy from pypy_windowsservercore-1809/Dockerfile
copy to pypy_windowsservercore-ltsc2022/Dockerfile
index b7ec372..fa589d8 100644
--- a/pypy_windowsservercore-1809/Dockerfile
+++ b/pypy_windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Relevant Maintainers:

@yosifkit yosifkit merged commit f4fcf3b into docker-library:master Mar 8, 2022
@yosifkit yosifkit deleted the pypy branch March 8, 2022 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants