From 72b605d4755c0e13098e59442882ee8e6a708227 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 29 Aug 2024 12:15:55 -0700 Subject: [PATCH] =?UTF-8?q?Add=20back=20Windows=20variants=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Dockerfile.pypy3.10-windowsservercore-1809 | 8 +++++ ...erfile.pypy3.10-windowsservercore-ltsc2022 | 8 +++++ ...ckerfile.python3.11-windowsservercore-1809 | 8 +++++ ...file.python3.11-windowsservercore-ltsc2022 | 8 +++++ ...ckerfile.python3.12-windowsservercore-1809 | 8 +++++ ...file.python3.12-windowsservercore-ltsc2022 | 8 +++++ dockerfiles-generated/library-hylang.template | 36 +++++++++++++++++++ update.sh | 10 ++---- 8 files changed, 86 insertions(+), 8 deletions(-) create mode 100644 dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-1809 create mode 100644 dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-ltsc2022 create mode 100644 dockerfiles-generated/Dockerfile.python3.11-windowsservercore-1809 create mode 100644 dockerfiles-generated/Dockerfile.python3.11-windowsservercore-ltsc2022 create mode 100644 dockerfiles-generated/Dockerfile.python3.12-windowsservercore-1809 create mode 100644 dockerfiles-generated/Dockerfile.python3.12-windowsservercore-ltsc2022 diff --git a/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-1809 b/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-1809 new file mode 100644 index 0000000..9dc1af5 --- /dev/null +++ b/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-1809 @@ -0,0 +1,8 @@ +FROM pypy:3.10-windowsservercore-1809 + +ENV HY_VERSION 0.29.0 +ENV HYRULE_VERSION 0.6.0 + +RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION) + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-ltsc2022 b/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-ltsc2022 new file mode 100644 index 0000000..b456e74 --- /dev/null +++ b/dockerfiles-generated/Dockerfile.pypy3.10-windowsservercore-ltsc2022 @@ -0,0 +1,8 @@ +FROM pypy:3.10-windowsservercore-ltsc2022 + +ENV HY_VERSION 0.29.0 +ENV HYRULE_VERSION 0.6.0 + +RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION) + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-1809 b/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-1809 new file mode 100644 index 0000000..ba0b640 --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-1809 @@ -0,0 +1,8 @@ +FROM python:3.11-windowsservercore-1809 + +ENV HY_VERSION 0.29.0 +ENV HYRULE_VERSION 0.6.0 + +RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION) + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-ltsc2022 b/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-ltsc2022 new file mode 100644 index 0000000..c92ee8e --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.11-windowsservercore-ltsc2022 @@ -0,0 +1,8 @@ +FROM python:3.11-windowsservercore-ltsc2022 + +ENV HY_VERSION 0.29.0 +ENV HYRULE_VERSION 0.6.0 + +RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION) + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-1809 b/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-1809 new file mode 100644 index 0000000..534d18e --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-1809 @@ -0,0 +1,8 @@ +FROM python:3.12-windowsservercore-1809 + +ENV HY_VERSION 0.29.0 +ENV HYRULE_VERSION 0.6.0 + +RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION) + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-ltsc2022 b/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-ltsc2022 new file mode 100644 index 0000000..59e242f --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.12-windowsservercore-ltsc2022 @@ -0,0 +1,8 @@ +FROM python:3.12-windowsservercore-ltsc2022 + +ENV HY_VERSION 0.29.0 +ENV HYRULE_VERSION 0.6.0 + +RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION) ('hyrule == {0}' -f $env:HYRULE_VERSION) + +CMD ["hy"] diff --git a/dockerfiles-generated/library-hylang.template b/dockerfiles-generated/library-hylang.template index b503b59..ae5bcce 100644 --- a/dockerfiles-generated/library-hylang.template +++ b/dockerfiles-generated/library-hylang.template @@ -20,6 +20,18 @@ Tags: 0.29.0-python3.12-alpine3.19, 0.29-python3.12-alpine3.19, 0-python3.12-alp Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x File: Dockerfile.python3.12-alpine3.19 +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 +SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest +Architectures: windows-amd64 +Constraints: windowsservercore-ltsc2022 +File: Dockerfile.python3.12-windowsservercore-ltsc2022 + +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 +SharedTags: 0.29.0-python3.12, 0.29-python3.12, 0-python3.12, python3.12, 0.29.0, 0.29, 0, latest +Architectures: windows-amd64 +Constraints: windowsservercore-1809 +File: Dockerfile.python3.12-windowsservercore-1809 + Tags: 0.29.0-python3.11-bookworm, 0.29-python3.11-bookworm, 0-python3.11-bookworm, python3.11-bookworm SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11 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 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x File: Dockerfile.python3.11-alpine3.19 +Tags: 0.29.0-python3.11-windowsservercore-ltsc2022, 0.29-python3.11-windowsservercore-ltsc2022, 0-python3.11-windowsservercore-ltsc2022, python3.11-windowsservercore-ltsc2022 +SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11 +Architectures: windows-amd64 +Constraints: windowsservercore-ltsc2022 +File: Dockerfile.python3.11-windowsservercore-ltsc2022 + +Tags: 0.29.0-python3.11-windowsservercore-1809, 0.29-python3.11-windowsservercore-1809, 0-python3.11-windowsservercore-1809, python3.11-windowsservercore-1809 +SharedTags: 0.29.0-python3.11, 0.29-python3.11, 0-python3.11, python3.11 +Architectures: windows-amd64 +Constraints: windowsservercore-1809 +File: Dockerfile.python3.11-windowsservercore-1809 + Tags: 0.29.0-python3.10-bookworm, 0.29-python3.10-bookworm, 0-python3.10-bookworm, python3.10-bookworm SharedTags: 0.29.0-python3.10, 0.29-python3.10, 0-python3.10, python3.10 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x @@ -96,3 +120,15 @@ File: Dockerfile.pypy3.10-bookworm 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 Architectures: amd64, arm64v8, i386 File: Dockerfile.pypy3.10-bullseye + +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 +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 +Architectures: windows-amd64 +Constraints: windowsservercore-ltsc2022 +File: Dockerfile.pypy3.10-windowsservercore-ltsc2022 + +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 +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 +Architectures: windows-amd64 +Constraints: windowsservercore-1809 +File: Dockerfile.pypy3.10-windowsservercore-1809 diff --git a/update.sh b/update.sh index 282e96a..1f530f8 100755 --- a/update.sh +++ b/update.sh @@ -151,14 +151,8 @@ for base in "${bases[@]}"; do target="Dockerfile.$hyTag" # "dockerfiles-generated/Dockerfile.python3.7-stretch", etc. case "$variant" in - windowsservercore-*) - case "${python%-rc}" in - 3.6 | 3.7 | 3.8 | 3.9) ;; - *) continue ;; # https://github.com/hylang/hy/issues/2114: Python 3.10 + Windows == incompatible thanks to pyreadline - esac - template='Dockerfile-windows.template' - ;; - *) template='Dockerfile-linux.template' ;; + windowsservercore-*) template='Dockerfile-windows.template' ;; + *) template='Dockerfile-linux.template' ;; esac echo "- $from ($target)"