Skip to content

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 23, 2025

Changes:

Changes:

- hylang/docker-hylang@d3302ad: Merge pull request hylang/docker-hylang#6 from yosifkit/ltsc2025
- hylang/docker-hylang@6672ad2: Add Windows Server 2025 variant
@tianon tianon requested a review from a team as a code owner January 23, 2025 00:30
Copy link

Diff for 8fa40a3:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 72f394f..9ee6cc5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,6 +1,6 @@
 Maintainers: Paul Tagliamonte <[email protected]> (@paultag), Hy Docker Team (@hylang/docker)
 GitRepo: https://github.com/hylang/docker-hylang.git
-GitCommit: 9e230dfec618cc0bea3d6c282a1a1b1ad23a7566
+GitCommit: 6672ad2ce79b2cb434a9f087a7af6df664de9ecd
 Directory: dockerfiles-generated
 
 Tags: 1.0.0-pypy3.10-bookworm, 1.0-pypy3.10-bookworm, 1-pypy3.10-bookworm, pypy3.10-bookworm, 1.0.0-pypy-bookworm, 1.0-pypy-bookworm, 1-pypy-bookworm, pypy-bookworm
@@ -24,6 +24,12 @@ Architectures: windows-amd64
 File: Dockerfile.pypy3.10-windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 1.0.0-pypy3.10-windowsservercore-ltsc2025, 1.0-pypy3.10-windowsservercore-ltsc2025, 1-pypy3.10-windowsservercore-ltsc2025, pypy3.10-windowsservercore-ltsc2025, 1.0.0-pypy-windowsservercore-ltsc2025, 1.0-pypy-windowsservercore-ltsc2025, 1-pypy-windowsservercore-ltsc2025, pypy-windowsservercore-ltsc2025
+SharedTags: 1.0.0-pypy3.10, 1.0-pypy3.10, 1-pypy3.10, pypy3.10, 1.0.0-pypy, 1.0-pypy, 1-pypy, pypy
+Architectures: windows-amd64
+File: Dockerfile.pypy3.10-windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
+
 Tags: 1.0.0-python3.9-alpine3.20, 1.0-python3.9-alpine3.20, 1-python3.9-alpine3.20, python3.9-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 File: Dockerfile.python3.9-alpine3.20
@@ -104,6 +110,12 @@ Architectures: windows-amd64
 File: Dockerfile.python3.12-windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
+Tags: 1.0.0-python3.12-windowsservercore-ltsc2025, 1.0-python3.12-windowsservercore-ltsc2025, 1-python3.12-windowsservercore-ltsc2025, python3.12-windowsservercore-ltsc2025
+SharedTags: 1.0.0-python3.12, 1.0-python3.12, 1-python3.12, python3.12
+Architectures: windows-amd64
+File: Dockerfile.python3.12-windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
+
 Tags: 1.0.0-python3.13-alpine3.20, 1.0-python3.13-alpine3.20, 1-python3.13-alpine3.20, python3.13-alpine3.20, 1.0.0-alpine3.20, 1.0-alpine3.20, 1-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.13-alpine3.20
@@ -132,3 +144,9 @@ SharedTags: 1.0.0-python3.13, 1.0-python3.13, 1-python3.13, python3.13, 1.0.0, 1
 Architectures: windows-amd64
 File: Dockerfile.python3.13-windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
+
+Tags: 1.0.0-python3.13-windowsservercore-ltsc2025, 1.0-python3.13-windowsservercore-ltsc2025, 1-python3.13-windowsservercore-ltsc2025, python3.13-windowsservercore-ltsc2025, 1.0.0-windowsservercore-ltsc2025, 1.0-windowsservercore-ltsc2025, 1-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 1.0.0-python3.13, 1.0-python3.13, 1-python3.13, python3.13, 1.0.0, 1.0, 1, latest
+Architectures: windows-amd64
+File: Dockerfile.python3.13-windowsservercore-ltsc2025
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index b74bc0a..554af2b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,10 +10,12 @@ hylang:1-pypy3.10-bookworm
 hylang:1-pypy3.10-bullseye
 hylang:1-pypy3.10-windowsservercore-1809
 hylang:1-pypy3.10-windowsservercore-ltsc2022
+hylang:1-pypy3.10-windowsservercore-ltsc2025
 hylang:1-pypy-bookworm
 hylang:1-pypy-bullseye
 hylang:1-pypy-windowsservercore-1809
 hylang:1-pypy-windowsservercore-ltsc2022
+hylang:1-pypy-windowsservercore-ltsc2025
 hylang:1-python3.9
 hylang:1-python3.9-alpine
 hylang:1-python3.9-alpine3.20
@@ -40,6 +42,7 @@ hylang:1-python3.12-bookworm
 hylang:1-python3.12-bullseye
 hylang:1-python3.12-windowsservercore-1809
 hylang:1-python3.12-windowsservercore-ltsc2022
+hylang:1-python3.12-windowsservercore-ltsc2025
 hylang:1-python3.13
 hylang:1-python3.13-alpine
 hylang:1-python3.13-alpine3.20
@@ -48,8 +51,10 @@ hylang:1-python3.13-bookworm
 hylang:1-python3.13-bullseye
 hylang:1-python3.13-windowsservercore-1809
 hylang:1-python3.13-windowsservercore-ltsc2022
+hylang:1-python3.13-windowsservercore-ltsc2025
 hylang:1-windowsservercore-1809
 hylang:1-windowsservercore-ltsc2022
+hylang:1-windowsservercore-ltsc2025
 hylang:1.0
 hylang:1.0-alpine
 hylang:1.0-alpine3.20
@@ -62,10 +67,12 @@ hylang:1.0-pypy3.10-bookworm
 hylang:1.0-pypy3.10-bullseye
 hylang:1.0-pypy3.10-windowsservercore-1809
 hylang:1.0-pypy3.10-windowsservercore-ltsc2022
+hylang:1.0-pypy3.10-windowsservercore-ltsc2025
 hylang:1.0-pypy-bookworm
 hylang:1.0-pypy-bullseye
 hylang:1.0-pypy-windowsservercore-1809
 hylang:1.0-pypy-windowsservercore-ltsc2022
+hylang:1.0-pypy-windowsservercore-ltsc2025
 hylang:1.0-python3.9
 hylang:1.0-python3.9-alpine
 hylang:1.0-python3.9-alpine3.20
@@ -92,6 +99,7 @@ hylang:1.0-python3.12-bookworm
 hylang:1.0-python3.12-bullseye
 hylang:1.0-python3.12-windowsservercore-1809
 hylang:1.0-python3.12-windowsservercore-ltsc2022
+hylang:1.0-python3.12-windowsservercore-ltsc2025
 hylang:1.0-python3.13
 hylang:1.0-python3.13-alpine
 hylang:1.0-python3.13-alpine3.20
@@ -100,8 +108,10 @@ hylang:1.0-python3.13-bookworm
 hylang:1.0-python3.13-bullseye
 hylang:1.0-python3.13-windowsservercore-1809
 hylang:1.0-python3.13-windowsservercore-ltsc2022
+hylang:1.0-python3.13-windowsservercore-ltsc2025
 hylang:1.0-windowsservercore-1809
 hylang:1.0-windowsservercore-ltsc2022
+hylang:1.0-windowsservercore-ltsc2025
 hylang:1.0.0
 hylang:1.0.0-alpine
 hylang:1.0.0-alpine3.20
@@ -114,10 +124,12 @@ hylang:1.0.0-pypy3.10-bookworm
 hylang:1.0.0-pypy3.10-bullseye
 hylang:1.0.0-pypy3.10-windowsservercore-1809
 hylang:1.0.0-pypy3.10-windowsservercore-ltsc2022
+hylang:1.0.0-pypy3.10-windowsservercore-ltsc2025
 hylang:1.0.0-pypy-bookworm
 hylang:1.0.0-pypy-bullseye
 hylang:1.0.0-pypy-windowsservercore-1809
 hylang:1.0.0-pypy-windowsservercore-ltsc2022
+hylang:1.0.0-pypy-windowsservercore-ltsc2025
 hylang:1.0.0-python3.9
 hylang:1.0.0-python3.9-alpine
 hylang:1.0.0-python3.9-alpine3.20
@@ -144,6 +156,7 @@ hylang:1.0.0-python3.12-bookworm
 hylang:1.0.0-python3.12-bullseye
 hylang:1.0.0-python3.12-windowsservercore-1809
 hylang:1.0.0-python3.12-windowsservercore-ltsc2022
+hylang:1.0.0-python3.12-windowsservercore-ltsc2025
 hylang:1.0.0-python3.13
 hylang:1.0.0-python3.13-alpine
 hylang:1.0.0-python3.13-alpine3.20
@@ -152,8 +165,10 @@ hylang:1.0.0-python3.13-bookworm
 hylang:1.0.0-python3.13-bullseye
 hylang:1.0.0-python3.13-windowsservercore-1809
 hylang:1.0.0-python3.13-windowsservercore-ltsc2022
+hylang:1.0.0-python3.13-windowsservercore-ltsc2025
 hylang:1.0.0-windowsservercore-1809
 hylang:1.0.0-windowsservercore-ltsc2022
+hylang:1.0.0-windowsservercore-ltsc2025
 hylang:alpine
 hylang:alpine3.20
 hylang:alpine3.21
@@ -166,10 +181,12 @@ hylang:pypy3.10-bookworm
 hylang:pypy3.10-bullseye
 hylang:pypy3.10-windowsservercore-1809
 hylang:pypy3.10-windowsservercore-ltsc2022
+hylang:pypy3.10-windowsservercore-ltsc2025
 hylang:pypy-bookworm
 hylang:pypy-bullseye
 hylang:pypy-windowsservercore-1809
 hylang:pypy-windowsservercore-ltsc2022
+hylang:pypy-windowsservercore-ltsc2025
 hylang:python3.9
 hylang:python3.9-alpine
 hylang:python3.9-alpine3.20
@@ -196,6 +213,7 @@ hylang:python3.12-bookworm
 hylang:python3.12-bullseye
 hylang:python3.12-windowsservercore-1809
 hylang:python3.12-windowsservercore-ltsc2022
+hylang:python3.12-windowsservercore-ltsc2025
 hylang:python3.13
 hylang:python3.13-alpine
 hylang:python3.13-alpine3.20
@@ -204,5 +222,7 @@ hylang:python3.13-bookworm
 hylang:python3.13-bullseye
 hylang:python3.13-windowsservercore-1809
 hylang:python3.13-windowsservercore-ltsc2022
+hylang:python3.13-windowsservercore-ltsc2025
 hylang:windowsservercore-1809
 hylang:windowsservercore-ltsc2022
+hylang:windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 470f7cb..01b20aa 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -6,6 +6,7 @@ hylang:pypy-bookworm
 hylang:pypy-bullseye
 hylang:pypy-windowsservercore-1809
 hylang:pypy-windowsservercore-ltsc2022
+hylang:pypy-windowsservercore-ltsc2025
 hylang:python3.9-alpine
 hylang:python3.9-alpine3.20
 hylang:python3.9-bookworm
@@ -24,5 +25,7 @@ hylang:python3.12-bookworm
 hylang:python3.12-bullseye
 hylang:python3.12-windowsservercore-1809
 hylang:python3.12-windowsservercore-ltsc2022
+hylang:python3.12-windowsservercore-ltsc2025
 hylang:windowsservercore-1809
 hylang:windowsservercore-ltsc2022
+hylang:windowsservercore-ltsc2025
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809 b/hylang_pypy-windowsservercore-ltsc2025/Dockerfile.pypy3.10-windowsservercore-ltsc2025
similarity index 79%
copy from hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
copy to hylang_pypy-windowsservercore-ltsc2025/Dockerfile.pypy3.10-windowsservercore-ltsc2025
index 89d9f59..cc10f89 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
+++ b/hylang_pypy-windowsservercore-ltsc2025/Dockerfile.pypy3.10-windowsservercore-ltsc2025
@@ -1,4 +1,4 @@
-FROM pypy:3.10-windowsservercore-1809
+FROM pypy:3.10-windowsservercore-ltsc2025
 
 ENV HY_VERSION 1.0.0
 ENV HYRULE_VERSION 0.8.0
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809 b/hylang_python3.12-windowsservercore-ltsc2025/Dockerfile.python3.12-windowsservercore-ltsc2025
similarity index 78%
copy from hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
copy to hylang_python3.12-windowsservercore-ltsc2025/Dockerfile.python3.12-windowsservercore-ltsc2025
index 89d9f59..243ff65 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
+++ b/hylang_python3.12-windowsservercore-ltsc2025/Dockerfile.python3.12-windowsservercore-ltsc2025
@@ -1,4 +1,4 @@
-FROM pypy:3.10-windowsservercore-1809
+FROM python:3.12-windowsservercore-ltsc2025
 
 ENV HY_VERSION 1.0.0
 ENV HYRULE_VERSION 0.8.0
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809 b/hylang_windowsservercore-ltsc2025/Dockerfile.python3.13-windowsservercore-ltsc2025
similarity index 78%
copy from hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
copy to hylang_windowsservercore-ltsc2025/Dockerfile.python3.13-windowsservercore-ltsc2025
index 89d9f59..32e5ecb 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.10-windowsservercore-1809
+++ b/hylang_windowsservercore-ltsc2025/Dockerfile.python3.13-windowsservercore-ltsc2025
@@ -1,4 +1,4 @@
-FROM pypy:3.10-windowsservercore-1809
+FROM python:3.13-windowsservercore-ltsc2025
 
 ENV HY_VERSION 1.0.0
 ENV HYRULE_VERSION 0.8.0

Relevant Maintainers:

@yosifkit yosifkit merged commit ac563ed into docker-library:master Jan 23, 2025
36 checks passed
@yosifkit yosifkit deleted the hylang branch January 23, 2025 01:02
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