Skip to content

Commit 72b605d

Browse files
tianontianon
committed
Add back Windows variants 🚀
1 parent 5e78df9 commit 72b605d

8 files changed

+86
-8
lines changed

‎dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-1809

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM pypy:3.10-windowsservercore-1809
2+
3+
ENV HY_VERSION 0.29.0
4+
ENV HYRULE_VERSION 0.6.0
5+
6+
RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
7+
8+
CMD ["hy"]

‎dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-ltsc2022

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM pypy:3.10-windowsservercore-ltsc2022
2+
3+
ENV HY_VERSION 0.29.0
4+
ENV HYRULE_VERSION 0.6.0
5+
6+
RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
7+
8+
CMD ["hy"]

‎dockerfiles-generated/Dockerfile.python3.11-windowsservercore-1809

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM python:3.11-windowsservercore-1809
2+
3+
ENV HY_VERSION 0.29.0
4+
ENV HYRULE_VERSION 0.6.0
5+
6+
RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
7+
8+
CMD ["hy"]

‎dockerfiles-generated/Dockerfile.python3.11-windowsservercore-ltsc2022

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM python:3.11-windowsservercore-ltsc2022
2+
3+
ENV HY_VERSION 0.29.0
4+
ENV HYRULE_VERSION 0.6.0
5+
6+
RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
7+
8+
CMD ["hy"]

‎dockerfiles-generated/Dockerfile.python3.12-windowsservercore-1809

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM python:3.12-windowsservercore-1809
2+
3+
ENV HY_VERSION 0.29.0
4+
ENV HYRULE_VERSION 0.6.0
5+
6+
RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
7+
8+
CMD ["hy"]

‎dockerfiles-generated/Dockerfile.python3.12-windowsservercore-ltsc2022

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM python:3.12-windowsservercore-ltsc2022
2+
3+
ENV HY_VERSION 0.29.0
4+
ENV HYRULE_VERSION 0.6.0
5+
6+
RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION)
7+
8+
CMD ["hy"]

‎dockerfiles-generated/library-hylang.template

+36
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,18 @@ Tags: 0.29.0-python3.12-alpine3.19, 0.29-python3.12-alpine3.19, 0-python3.12-alp
2020
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
2121
File: Dockerfile.python3.12-alpine3.19
2222

23+
Tags: 0.29.0-python3.12-windowsservercore-ltsc2022, 0.29-python3.12-windowsservercore-ltsc2022, 0-python3.12-windowsservercore-ltsc2022, python3.12-windowsservercore-ltsc2022, 0.29.0-windowsservercore-ltsc2022, 0.29-windowsservercore-ltsc2022, 0-windowsservercore-ltsc2022, windowsservercore-ltsc2022
24+
SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest
25+
Architectures: windows-amd64
26+
Constraints: windowsservercore-ltsc2022
27+
File: Dockerfile.python3.12-windowsservercore-ltsc2022
28+
29+
Tags: 0.29.0-python3.12-windowsservercore-1809, 0.29-python3.12-windowsservercore-1809, 0-python3.12-windowsservercore-1809, python3.12-windowsservercore-1809, 0.29.0-windowsservercore-1809, 0.29-windowsservercore-1809, 0-windowsservercore-1809, windowsservercore-1809
30+
SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest
31+
Architectures: windows-amd64
32+
Constraints: windowsservercore-1809
33+
File: Dockerfile.python3.12-windowsservercore-1809
34+
2335
Tags: 0.29.0-python3.11-bookworm, 0.29-python3.11-bookworm, 0-python3.11-bookworm, python3.11-bookworm
2436
SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
2537
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -37,6 +49,18 @@ Tags: 0.29.0-python3.11-alpine3.19, 0.29-python3.11-alpine3.19, 0-python3.11-alp
3749
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
3850
File: Dockerfile.python3.11-alpine3.19
3951

52+
Tags: 0.29.0-python3.11-windowsservercore-ltsc2022, 0.29-python3.11-windowsservercore-ltsc2022, 0-python3.11-windowsservercore-ltsc2022, python3.11-windowsservercore-ltsc2022
53+
SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
54+
Architectures: windows-amd64
55+
Constraints: windowsservercore-ltsc2022
56+
File: Dockerfile.python3.11-windowsservercore-ltsc2022
57+
58+
Tags: 0.29.0-python3.11-windowsservercore-1809, 0.29-python3.11-windowsservercore-1809, 0-python3.11-windowsservercore-1809, python3.11-windowsservercore-1809
59+
SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11
60+
Architectures: windows-amd64
61+
Constraints: windowsservercore-1809
62+
File: Dockerfile.python3.11-windowsservercore-1809
63+
4064
Tags: 0.29.0-python3.10-bookworm, 0.29-python3.10-bookworm, 0-python3.10-bookworm, python3.10-bookworm
4165
SharedTags: 0.29.0-python3.10, 0.29-python3.10, 0-python3.10, python3.10
4266
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -96,3 +120,15 @@ File: Dockerfile.pypy3.10-bookworm
96120
Tags: 0.29.0-pypy3.10-bullseye, 0.29-pypy3.10-bullseye, 0-pypy3.10-bullseye, pypy3.10-bullseye, 0.29.0-pypy-bullseye, 0.29-pypy-bullseye, 0-pypy-bullseye, pypy-bullseye
97121
Architectures: amd64, arm64v8, i386
98122
File: Dockerfile.pypy3.10-bullseye
123+
124+
Tags: 0.29.0-pypy3.10-windowsservercore-ltsc2022, 0.29-pypy3.10-windowsservercore-ltsc2022, 0-pypy3.10-windowsservercore-ltsc2022, pypy3.10-windowsservercore-ltsc2022, 0.29.0-pypy-windowsservercore-ltsc2022, 0.29-pypy-windowsservercore-ltsc2022, 0-pypy-windowsservercore-ltsc2022, pypy-windowsservercore-ltsc2022
125+
SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
126+
Architectures: windows-amd64
127+
Constraints: windowsservercore-ltsc2022
128+
File: Dockerfile.pypy3.10-windowsservercore-ltsc2022
129+
130+
Tags: 0.29.0-pypy3.10-windowsservercore-1809, 0.29-pypy3.10-windowsservercore-1809, 0-pypy3.10-windowsservercore-1809, pypy3.10-windowsservercore-1809, 0.29.0-pypy-windowsservercore-1809, 0.29-pypy-windowsservercore-1809, 0-pypy-windowsservercore-1809, pypy-windowsservercore-1809
131+
SharedTags: 0.29.0-pypy3.10, 0.29-pypy3.10, 0-pypy3.10, pypy3.10, 0.29.0-pypy, 0.29-pypy, 0-pypy, pypy
132+
Architectures: windows-amd64
133+
Constraints: windowsservercore-1809
134+
File: Dockerfile.pypy3.10-windowsservercore-1809

‎update.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,8 @@ for base in "${bases[@]}"; do
151151
target="Dockerfile.$hyTag" # "dockerfiles-generated/Dockerfile.python3.7-stretch", etc.
152152

153153
case "$variant" in
154-
windowsservercore-*)
155-
case "${python%-rc}" in
156-
3.6 | 3.7 | 3.8 | 3.9) ;;
157-
*) continue ;; # https://github.com/hylang/hy/issues/2114: Python 3.10 + Windows == incompatible thanks to pyreadline
158-
esac
159-
template='Dockerfile-windows.template'
160-
;;
161-
*) template='Dockerfile-linux.template' ;;
154+
windowsservercore-*) template='Dockerfile-windows.template' ;;
155+
*) template='Dockerfile-linux.template' ;;
162156
esac
163157

164158
echo "- $from ($target)"

0 commit comments

Comments
 (0)