Update hylang

[tianon]

Changes:

• hylang/docker-hylang@f73e370: Merge pull request Update to 1.0a1 hylang/docker-hylang#3 from tianon/1.0a1
• hylang/docker-hylang@a9b44f1: Update to 1.0a1
• hylang/docker-hylang@cda00e7: Add the update.sh improvements from Update to 1.0a1 hylang/docker-hylang#3

[github-actions]

Diff for 5986747:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 917489c..123c0b2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,74 +1,124 @@
 Maintainers: Paul Tagliamonte <paultag@hylang.org> (@paultag), Hy Docker Team (@hylang/docker)
 GitRepo: https://github.com/hylang/docker-hylang.git
-GitCommit: 4d8c121c54e2dba1f5b58dc8167d1069ff24f496
+GitCommit: a9b44f188690a2d07590dde5e46499b58e42b6a3
 Directory: dockerfiles-generated
 
-Tags: 0.20.0-pypy3.7-buster, 0.20-pypy3.7-buster, 0-pypy3.7-buster, pypy3.7-buster, 0.20.0-pypy-buster, 0.20-pypy-buster, 0-pypy-buster, pypy-buster
-SharedTags: 0.20.0-pypy3.7, 0.20-pypy3.7, 0-pypy3.7, pypy3.7, 0.20.0-pypy, 0.20-pypy, 0-pypy, pypy
+Tags: 1.0a1-pypy3.7-buster, pypy3.7-buster, 1.0a1-pypy-buster, pypy-buster
+SharedTags: 1.0a1-pypy3.7, pypy3.7, 1.0a1-pypy, pypy
 Architectures: amd64, arm64v8, i386, s390x
 File: Dockerfile.pypy3.7-buster
 
-Tags: 0.20.0-pypy3.7-windowsservercore-1809, 0.20-pypy3.7-windowsservercore-1809, 0-pypy3.7-windowsservercore-1809, pypy3.7-windowsservercore-1809, 0.20.0-pypy-windowsservercore-1809, 0.20-pypy-windowsservercore-1809, 0-pypy-windowsservercore-1809, pypy-windowsservercore-1809
-SharedTags: 0.20.0-pypy3.7, 0.20-pypy3.7, 0-pypy3.7, pypy3.7, 0.20.0-pypy, 0.20-pypy, 0-pypy, pypy
+Tags: 1.0a1-pypy3.7-windowsservercore-1809, pypy3.7-windowsservercore-1809, 1.0a1-pypy-windowsservercore-1809, pypy-windowsservercore-1809
+SharedTags: 1.0a1-pypy3.7, pypy3.7, 1.0a1-pypy, pypy
 Architectures: windows-amd64
 File: Dockerfile.pypy3.7-windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 0.20.0-python3.6-alpine3.12, 0.20-python3.6-alpine3.12, 0-python3.6-alpine3.12, python3.6-alpine3.12
+Tags: 1.0a1-python3.6-alpine3.12, python3.6-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.6-alpine3.12
 
-Tags: 0.20.0-python3.6-alpine3.13, 0.20-python3.6-alpine3.13, 0-python3.6-alpine3.13, python3.6-alpine3.13, 0.20.0-python3.6-alpine, 0.20-python3.6-alpine, 0-python3.6-alpine, python3.6-alpine
+Tags: 1.0a1-python3.6-alpine3.13, python3.6-alpine3.13, 1.0a1-python3.6-alpine, python3.6-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.6-alpine3.13
 
-Tags: 0.20.0-python3.6-buster, 0.20-python3.6-buster, 0-python3.6-buster, python3.6-buster
-SharedTags: 0.20.0-python3.6, 0.20-python3.6, 0-python3.6, python3.6
+Tags: 1.0a1-python3.6-buster, python3.6-buster
+SharedTags: 1.0a1-python3.6, python3.6
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 File: Dockerfile.python3.6-buster
 
-Tags: 0.20.0-python3.6-stretch, 0.20-python3.6-stretch, 0-python3.6-stretch, python3.6-stretch
+Tags: 1.0a1-python3.6-stretch, python3.6-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
 File: Dockerfile.python3.6-stretch
 
-Tags: 0.20.0-python3.7-alpine3.12, 0.20-python3.7-alpine3.12, 0-python3.7-alpine3.12, python3.7-alpine3.12
+Tags: 1.0a1-python3.7-alpine3.12, python3.7-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.7-alpine3.12
 
-Tags: 0.20.0-python3.7-alpine3.13, 0.20-python3.7-alpine3.13, 0-python3.7-alpine3.13, python3.7-alpine3.13, 0.20.0-python3.7-alpine, 0.20-python3.7-alpine, 0-python3.7-alpine, python3.7-alpine
+Tags: 1.0a1-python3.7-alpine3.13, python3.7-alpine3.13, 1.0a1-python3.7-alpine, python3.7-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.7-alpine3.13
 
-Tags: 0.20.0-python3.7-buster, 0.20-python3.7-buster, 0-python3.7-buster, python3.7-buster
-SharedTags: 0.20.0-python3.7, 0.20-python3.7, 0-python3.7, python3.7
+Tags: 1.0a1-python3.7-buster, python3.7-buster
+SharedTags: 1.0a1-python3.7, python3.7
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 File: Dockerfile.python3.7-buster
 
-Tags: 0.20.0-python3.7-stretch, 0.20-python3.7-stretch, 0-python3.7-stretch, python3.7-stretch
+Tags: 1.0a1-python3.7-stretch, python3.7-stretch
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386
 File: Dockerfile.python3.7-stretch
 
-Tags: 0.20.0-python3.8-alpine3.12, 0.20-python3.8-alpine3.12, 0-python3.8-alpine3.12, python3.8-alpine3.12, 0.20.0-alpine3.12, 0.20-alpine3.12, 0-alpine3.12, alpine3.12
+Tags: 1.0a1-python3.8-alpine3.12, python3.8-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.8-alpine3.12
 
-Tags: 0.20.0-python3.8-alpine3.13, 0.20-python3.8-alpine3.13, 0-python3.8-alpine3.13, python3.8-alpine3.13, 0.20.0-alpine3.13, 0.20-alpine3.13, 0-alpine3.13, alpine3.13, 0.20.0-python3.8-alpine, 0.20-python3.8-alpine, 0-python3.8-alpine, python3.8-alpine, 0.20.0-alpine, 0.20-alpine, 0-alpine, alpine
+Tags: 1.0a1-python3.8-alpine3.13, python3.8-alpine3.13, 1.0a1-python3.8-alpine, python3.8-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 File: Dockerfile.python3.8-alpine3.13
 
-Tags: 0.20.0-python3.8-buster, 0.20-python3.8-buster, 0-python3.8-buster, python3.8-buster, 0.20.0-buster, 0.20-buster, 0-buster, buster
-SharedTags: 0.20.0-python3.8, 0.20-python3.8, 0-python3.8, python3.8, 0.20.0, 0.20, 0, latest
+Tags: 1.0a1-python3.8-buster, python3.8-buster
+SharedTags: 1.0a1-python3.8, python3.8
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 File: Dockerfile.python3.8-buster
 
-Tags: 0.20.0-python3.8-windowsservercore-1809, 0.20-python3.8-windowsservercore-1809, 0-python3.8-windowsservercore-1809, python3.8-windowsservercore-1809, 0.20.0-windowsservercore-1809, 0.20-windowsservercore-1809, 0-windowsservercore-1809, windowsservercore-1809
-SharedTags: 0.20.0-python3.8, 0.20-python3.8, 0-python3.8, python3.8, 0.20.0, 0.20, 0, latest
+Tags: 1.0a1-python3.8-windowsservercore-1809, python3.8-windowsservercore-1809
+SharedTags: 1.0a1-python3.8, python3.8
 Architectures: windows-amd64
 File: Dockerfile.python3.8-windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 0.20.0-python3.8-windowsservercore-ltsc2016, 0.20-python3.8-windowsservercore-ltsc2016, 0-python3.8-windowsservercore-ltsc2016, python3.8-windowsservercore-ltsc2016, 0.20.0-windowsservercore-ltsc2016, 0.20-windowsservercore-ltsc2016, 0-windowsservercore-ltsc2016, windowsservercore-ltsc2016
-SharedTags: 0.20.0-python3.8, 0.20-python3.8, 0-python3.8, python3.8, 0.20.0, 0.20, 0, latest
+Tags: 1.0a1-python3.8-windowsservercore-ltsc2016, python3.8-windowsservercore-ltsc2016
+SharedTags: 1.0a1-python3.8, python3.8
 Architectures: windows-amd64
 File: Dockerfile.python3.8-windowsservercore-ltsc2016
 Constraints: windowsservercore-ltsc2016
+
+Tags: 1.0a1-python3.9-alpine3.12, python3.9-alpine3.12, 1.0a1-alpine3.12, alpine3.12
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+File: Dockerfile.python3.9-alpine3.12
+
+Tags: 1.0a1-python3.9-alpine3.13, python3.9-alpine3.13, 1.0a1-alpine3.13, alpine3.13, 1.0a1-python3.9-alpine, python3.9-alpine, 1.0a1-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+File: Dockerfile.python3.9-alpine3.13
+
+Tags: 1.0a1-python3.9-buster, python3.9-buster, 1.0a1-buster, buster
+SharedTags: 1.0a1-python3.9, python3.9, 1.0a1, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+File: Dockerfile.python3.9-buster
+
+Tags: 1.0a1-python3.9-windowsservercore-1809, python3.9-windowsservercore-1809, 1.0a1-windowsservercore-1809, windowsservercore-1809
+SharedTags: 1.0a1-python3.9, python3.9, 1.0a1, latest
+Architectures: windows-amd64
+File: Dockerfile.python3.9-windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 1.0a1-python3.9-windowsservercore-ltsc2016, python3.9-windowsservercore-ltsc2016, 1.0a1-windowsservercore-ltsc2016, windowsservercore-ltsc2016
+SharedTags: 1.0a1-python3.9, python3.9, 1.0a1, latest
+Architectures: windows-amd64
+File: Dockerfile.python3.9-windowsservercore-ltsc2016
+Constraints: windowsservercore-ltsc2016
+
+Tags: 1.0a1-python3.10-rc-alpine3.12, python3.10-rc-alpine3.12
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+File: Dockerfile.python3.10-rc-alpine3.12
+
+Tags: 1.0a1-python3.10-rc-alpine3.13, python3.10-rc-alpine3.13, 1.0a1-python3.10-rc-alpine, python3.10-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+File: Dockerfile.python3.10-rc-alpine3.13
+
+Tags: 1.0a1-python3.10-rc-buster, python3.10-rc-buster
+SharedTags: 1.0a1-python3.10-rc, python3.10-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+File: Dockerfile.python3.10-rc-buster
+
+Tags: 1.0a1-python3.10-rc-windowsservercore-1809, python3.10-rc-windowsservercore-1809
+SharedTags: 1.0a1-python3.10-rc, python3.10-rc
+Architectures: windows-amd64
+File: Dockerfile.python3.10-rc-windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 1.0a1-python3.10-rc-windowsservercore-ltsc2016, python3.10-rc-windowsservercore-ltsc2016
+SharedTags: 1.0a1-python3.10-rc, python3.10-rc
+Architectures: windows-amd64
+File: Dockerfile.python3.10-rc-windowsservercore-ltsc2016
+Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 93011ce..fa71d88 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,99 +1,49 @@
-hylang:0
-hylang:0-alpine
-hylang:0-alpine3.12
-hylang:0-alpine3.13
-hylang:0-buster
-hylang:0-pypy
-hylang:0-pypy3.7
-hylang:0-pypy3.7-buster
-hylang:0-pypy3.7-windowsservercore-1809
-hylang:0-pypy-buster
-hylang:0-pypy-windowsservercore-1809
-hylang:0-python3.6
-hylang:0-python3.6-alpine
-hylang:0-python3.6-alpine3.12
-hylang:0-python3.6-alpine3.13
-hylang:0-python3.6-buster
-hylang:0-python3.6-stretch
-hylang:0-python3.7
-hylang:0-python3.7-alpine
-hylang:0-python3.7-alpine3.12
-hylang:0-python3.7-alpine3.13
-hylang:0-python3.7-buster
-hylang:0-python3.7-stretch
-hylang:0-python3.8
-hylang:0-python3.8-alpine
-hylang:0-python3.8-alpine3.12
-hylang:0-python3.8-alpine3.13
-hylang:0-python3.8-buster
-hylang:0-python3.8-windowsservercore-1809
-hylang:0-python3.8-windowsservercore-ltsc2016
-hylang:0-windowsservercore-1809
-hylang:0-windowsservercore-ltsc2016
-hylang:0.20
-hylang:0.20-alpine
-hylang:0.20-alpine3.12
-hylang:0.20-alpine3.13
-hylang:0.20-buster
-hylang:0.20-pypy
-hylang:0.20-pypy3.7
-hylang:0.20-pypy3.7-buster
-hylang:0.20-pypy3.7-windowsservercore-1809
-hylang:0.20-pypy-buster
-hylang:0.20-pypy-windowsservercore-1809
-hylang:0.20-python3.6
-hylang:0.20-python3.6-alpine
-hylang:0.20-python3.6-alpine3.12
-hylang:0.20-python3.6-alpine3.13
-hylang:0.20-python3.6-buster
-hylang:0.20-python3.6-stretch
-hylang:0.20-python3.7
-hylang:0.20-python3.7-alpine
-hylang:0.20-python3.7-alpine3.12
-hylang:0.20-python3.7-alpine3.13
-hylang:0.20-python3.7-buster
-hylang:0.20-python3.7-stretch
-hylang:0.20-python3.8
-hylang:0.20-python3.8-alpine
-hylang:0.20-python3.8-alpine3.12
-hylang:0.20-python3.8-alpine3.13
-hylang:0.20-python3.8-buster
-hylang:0.20-python3.8-windowsservercore-1809
-hylang:0.20-python3.8-windowsservercore-ltsc2016
-hylang:0.20-windowsservercore-1809
-hylang:0.20-windowsservercore-ltsc2016
-hylang:0.20.0
-hylang:0.20.0-alpine
-hylang:0.20.0-alpine3.12
-hylang:0.20.0-alpine3.13
-hylang:0.20.0-buster
-hylang:0.20.0-pypy
-hylang:0.20.0-pypy3.7
-hylang:0.20.0-pypy3.7-buster
-hylang:0.20.0-pypy3.7-windowsservercore-1809
-hylang:0.20.0-pypy-buster
-hylang:0.20.0-pypy-windowsservercore-1809
-hylang:0.20.0-python3.6
-hylang:0.20.0-python3.6-alpine
-hylang:0.20.0-python3.6-alpine3.12
-hylang:0.20.0-python3.6-alpine3.13
-hylang:0.20.0-python3.6-buster
-hylang:0.20.0-python3.6-stretch
-hylang:0.20.0-python3.7
-hylang:0.20.0-python3.7-alpine
-hylang:0.20.0-python3.7-alpine3.12
-hylang:0.20.0-python3.7-alpine3.13
-hylang:0.20.0-python3.7-buster
-hylang:0.20.0-python3.7-stretch
-hylang:0.20.0-python3.8
-hylang:0.20.0-python3.8-alpine
-hylang:0.20.0-python3.8-alpine3.12
-hylang:0.20.0-python3.8-alpine3.13
-hylang:0.20.0-python3.8-buster
-hylang:0.20.0-python3.8-windowsservercore-1809
-hylang:0.20.0-python3.8-windowsservercore-ltsc2016
-hylang:0.20.0-windowsservercore-1809
-hylang:0.20.0-windowsservercore-ltsc2016
+hylang:1.0a1
+hylang:1.0a1-alpine
+hylang:1.0a1-alpine3.12
+hylang:1.0a1-alpine3.13
+hylang:1.0a1-buster
+hylang:1.0a1-pypy
+hylang:1.0a1-pypy3.7
+hylang:1.0a1-pypy3.7-buster
+hylang:1.0a1-pypy3.7-windowsservercore-1809
+hylang:1.0a1-pypy-buster
+hylang:1.0a1-pypy-windowsservercore-1809
+hylang:1.0a1-python3.6
+hylang:1.0a1-python3.6-alpine
+hylang:1.0a1-python3.6-alpine3.12
+hylang:1.0a1-python3.6-alpine3.13
+hylang:1.0a1-python3.6-buster
+hylang:1.0a1-python3.6-stretch
+hylang:1.0a1-python3.7
+hylang:1.0a1-python3.7-alpine
+hylang:1.0a1-python3.7-alpine3.12
+hylang:1.0a1-python3.7-alpine3.13
+hylang:1.0a1-python3.7-buster
+hylang:1.0a1-python3.7-stretch
+hylang:1.0a1-python3.8
+hylang:1.0a1-python3.8-alpine
+hylang:1.0a1-python3.8-alpine3.12
+hylang:1.0a1-python3.8-alpine3.13
+hylang:1.0a1-python3.8-buster
+hylang:1.0a1-python3.8-windowsservercore-1809
+hylang:1.0a1-python3.8-windowsservercore-ltsc2016
+hylang:1.0a1-python3.9
+hylang:1.0a1-python3.9-alpine
+hylang:1.0a1-python3.9-alpine3.12
+hylang:1.0a1-python3.9-alpine3.13
+hylang:1.0a1-python3.9-buster
+hylang:1.0a1-python3.9-windowsservercore-1809
+hylang:1.0a1-python3.9-windowsservercore-ltsc2016
+hylang:1.0a1-python3.10-rc
+hylang:1.0a1-python3.10-rc-alpine
+hylang:1.0a1-python3.10-rc-alpine3.12
+hylang:1.0a1-python3.10-rc-alpine3.13
+hylang:1.0a1-python3.10-rc-buster
+hylang:1.0a1-python3.10-rc-windowsservercore-1809
+hylang:1.0a1-python3.10-rc-windowsservercore-ltsc2016
+hylang:1.0a1-windowsservercore-1809
+hylang:1.0a1-windowsservercore-ltsc2016
 hylang:alpine
 hylang:alpine3.12
 hylang:alpine3.13
@@ -124,5 +74,19 @@ hylang:python3.8-alpine3.13
 hylang:python3.8-buster
 hylang:python3.8-windowsservercore-1809
 hylang:python3.8-windowsservercore-ltsc2016
+hylang:python3.9
+hylang:python3.9-alpine
+hylang:python3.9-alpine3.12
+hylang:python3.9-alpine3.13
+hylang:python3.9-buster
+hylang:python3.9-windowsservercore-1809
+hylang:python3.9-windowsservercore-ltsc2016
+hylang:python3.10-rc
+hylang:python3.10-rc-alpine
+hylang:python3.10-rc-alpine3.12
+hylang:python3.10-rc-alpine3.13
+hylang:python3.10-rc-buster
+hylang:python3.10-rc-windowsservercore-1809
+hylang:python3.10-rc-windowsservercore-ltsc2016
 hylang:windowsservercore-1809
 hylang:windowsservercore-ltsc2016
diff --git a/hylang_pypy-buster/Dockerfile.pypy3.7-buster b/hylang_alpine/Dockerfile.python3.9-alpine3.13
similarity index 57%
copy from hylang_pypy-buster/Dockerfile.pypy3.7-buster
copy to hylang_alpine/Dockerfile.python3.9-alpine3.13
index b0eba61..635d79b 100644
--- a/hylang_pypy-buster/Dockerfile.pypy3.7-buster
+++ b/hylang_alpine/Dockerfile.python3.9-alpine3.13
@@ -1,6 +1,6 @@
-FROM pypy:3.7-slim-buster
+FROM python:3.9-alpine3.13
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_pypy-buster/Dockerfile.pypy3.7-buster b/hylang_alpine3.12/Dockerfile.python3.9-alpine3.12
similarity index 57%
copy from hylang_pypy-buster/Dockerfile.pypy3.7-buster
copy to hylang_alpine3.12/Dockerfile.python3.9-alpine3.12
index b0eba61..7f52b59 100644
--- a/hylang_pypy-buster/Dockerfile.pypy3.7-buster
+++ b/hylang_alpine3.12/Dockerfile.python3.9-alpine3.12
@@ -1,6 +1,6 @@
-FROM pypy:3.7-slim-buster
+FROM python:3.9-alpine3.12
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12 b/hylang_buster/Dockerfile.python3.9-buster
similarity index 57%
copy from hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
copy to hylang_buster/Dockerfile.python3.9-buster
index 944fc5b..e80428e 100644
--- a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
+++ b/hylang_buster/Dockerfile.python3.9-buster
@@ -1,6 +1,6 @@
-FROM python:3.8-alpine3.12
+FROM python:3.9-slim-buster
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_pypy-buster/Dockerfile.pypy3.7-buster b/hylang_pypy-buster/Dockerfile.pypy3.7-buster
index b0eba61..1f4c47b 100644
--- a/hylang_pypy-buster/Dockerfile.pypy3.7-buster
+++ b/hylang_pypy-buster/Dockerfile.pypy3.7-buster
@@ -1,6 +1,6 @@
 FROM pypy:3.7-slim-buster
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809 b/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
index 4b4245b..c46e058 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
+++ b/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
@@ -1,6 +1,6 @@
 FROM pypy:3.7-windowsservercore-1809
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION)
 
diff --git a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12 b/hylang_python3.10-rc-alpine/Dockerfile.python3.10-rc-alpine3.13
similarity index 55%
copy from hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
copy to hylang_python3.10-rc-alpine/Dockerfile.python3.10-rc-alpine3.13
index 944fc5b..79d5d4c 100644
--- a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
+++ b/hylang_python3.10-rc-alpine/Dockerfile.python3.10-rc-alpine3.13
@@ -1,6 +1,6 @@
-FROM python:3.8-alpine3.12
+FROM python:3.10-rc-alpine3.13
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12 b/hylang_python3.10-rc-alpine3.12/Dockerfile.python3.10-rc-alpine3.12
similarity index 55%
copy from hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
copy to hylang_python3.10-rc-alpine3.12/Dockerfile.python3.10-rc-alpine3.12
index 944fc5b..8636526 100644
--- a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
+++ b/hylang_python3.10-rc-alpine3.12/Dockerfile.python3.10-rc-alpine3.12
@@ -1,6 +1,6 @@
-FROM python:3.8-alpine3.12
+FROM python:3.10-rc-alpine3.12
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12 b/hylang_python3.10-rc-buster/Dockerfile.python3.10-rc-buster
similarity index 55%
copy from hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
copy to hylang_python3.10-rc-buster/Dockerfile.python3.10-rc-buster
index 944fc5b..c6c1033 100644
--- a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
+++ b/hylang_python3.10-rc-buster/Dockerfile.python3.10-rc-buster
@@ -1,6 +1,6 @@
-FROM python:3.8-alpine3.12
+FROM python:3.10-rc-slim-buster
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809 b/hylang_python3.10-rc-windowsservercore-1809/Dockerfile.python3.10-rc-windowsservercore-1809
similarity index 54%
copy from hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
copy to hylang_python3.10-rc-windowsservercore-1809/Dockerfile.python3.10-rc-windowsservercore-1809
index 4b4245b..66fcc5a 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
+++ b/hylang_python3.10-rc-windowsservercore-1809/Dockerfile.python3.10-rc-windowsservercore-1809
@@ -1,6 +1,6 @@
-FROM pypy:3.7-windowsservercore-1809
+FROM python:3.10-rc-windowsservercore-1809
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION)
 
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809 b/hylang_python3.10-rc-windowsservercore-ltsc2016/Dockerfile.python3.10-rc-windowsservercore-ltsc2016
similarity index 53%
copy from hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
copy to hylang_python3.10-rc-windowsservercore-ltsc2016/Dockerfile.python3.10-rc-windowsservercore-ltsc2016
index 4b4245b..6b81d25 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
+++ b/hylang_python3.10-rc-windowsservercore-ltsc2016/Dockerfile.python3.10-rc-windowsservercore-ltsc2016
@@ -1,6 +1,6 @@
-FROM pypy:3.7-windowsservercore-1809
+FROM python:3.10-rc-windowsservercore-ltsc2016
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION)
 
diff --git a/hylang_python3.6-alpine/Dockerfile.python3.6-alpine3.13 b/hylang_python3.6-alpine/Dockerfile.python3.6-alpine3.13
index 979128a..8143e92 100644
--- a/hylang_python3.6-alpine/Dockerfile.python3.6-alpine3.13
+++ b/hylang_python3.6-alpine/Dockerfile.python3.6-alpine3.13
@@ -1,6 +1,6 @@
 FROM python:3.6-alpine3.13
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_python3.6-alpine3.12/Dockerfile.python3.6-alpine3.12 b/hylang_python3.6-alpine3.12/Dockerfile.python3.6-alpine3.12
index c212328..7f0fc96 100644
--- a/hylang_python3.6-alpine3.12/Dockerfile.python3.6-alpine3.12
+++ b/hylang_python3.6-alpine3.12/Dockerfile.python3.6-alpine3.12
@@ -1,6 +1,6 @@
 FROM python:3.6-alpine3.12
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_python3.6-buster/Dockerfile.python3.6-buster b/hylang_python3.6-buster/Dockerfile.python3.6-buster
index e3f45be..482f42a 100644
--- a/hylang_python3.6-buster/Dockerfile.python3.6-buster
+++ b/hylang_python3.6-buster/Dockerfile.python3.6-buster
@@ -1,6 +1,6 @@
 FROM python:3.6-slim-buster
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_python3.6-stretch/Dockerfile.python3.6-stretch b/hylang_python3.6-stretch/Dockerfile.python3.6-stretch
index 9584ece..49d7d29 100644
--- a/hylang_python3.6-stretch/Dockerfile.python3.6-stretch
+++ b/hylang_python3.6-stretch/Dockerfile.python3.6-stretch
@@ -1,6 +1,6 @@
 FROM python:3.6-slim-stretch
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_python3.7-alpine/Dockerfile.python3.7-alpine3.13 b/hylang_python3.7-alpine/Dockerfile.python3.7-alpine3.13
index aef8e05..bc5c675 100644
--- a/hylang_python3.7-alpine/Dockerfile.python3.7-alpine3.13
+++ b/hylang_python3.7-alpine/Dockerfile.python3.7-alpine3.13
@@ -1,6 +1,6 @@
 FROM python:3.7-alpine3.13
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_python3.7-alpine3.12/Dockerfile.python3.7-alpine3.12 b/hylang_python3.7-alpine3.12/Dockerfile.python3.7-alpine3.12
index b5c9fae..96aa3bf 100644
--- a/hylang_python3.7-alpine3.12/Dockerfile.python3.7-alpine3.12
+++ b/hylang_python3.7-alpine3.12/Dockerfile.python3.7-alpine3.12
@@ -1,6 +1,6 @@
 FROM python:3.7-alpine3.12
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_python3.7-buster/Dockerfile.python3.7-buster b/hylang_python3.7-buster/Dockerfile.python3.7-buster
index 46f63d7..5b84ca9 100644
--- a/hylang_python3.7-buster/Dockerfile.python3.7-buster
+++ b/hylang_python3.7-buster/Dockerfile.python3.7-buster
@@ -1,6 +1,6 @@
 FROM python:3.7-slim-buster
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_python3.7-stretch/Dockerfile.python3.7-stretch b/hylang_python3.7-stretch/Dockerfile.python3.7-stretch
index 9ff7cb2..ad72568 100644
--- a/hylang_python3.7-stretch/Dockerfile.python3.7-stretch
+++ b/hylang_python3.7-stretch/Dockerfile.python3.7-stretch
@@ -1,6 +1,6 @@
 FROM python:3.7-slim-stretch
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_alpine/Dockerfile.python3.8-alpine3.13 b/hylang_python3.8-alpine/Dockerfile.python3.8-alpine3.13
similarity index 80%
rename from hylang_alpine/Dockerfile.python3.8-alpine3.13
rename to hylang_python3.8-alpine/Dockerfile.python3.8-alpine3.13
index d1a8656..1b0244e 100644
--- a/hylang_alpine/Dockerfile.python3.8-alpine3.13
+++ b/hylang_python3.8-alpine/Dockerfile.python3.8-alpine3.13
@@ -1,6 +1,6 @@
 FROM python:3.8-alpine3.13
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12 b/hylang_python3.8-alpine3.12/Dockerfile.python3.8-alpine3.12
similarity index 80%
rename from hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
rename to hylang_python3.8-alpine3.12/Dockerfile.python3.8-alpine3.12
index 944fc5b..529ab98 100644
--- a/hylang_alpine3.12/Dockerfile.python3.8-alpine3.12
+++ b/hylang_python3.8-alpine3.12/Dockerfile.python3.8-alpine3.12
@@ -1,6 +1,6 @@
 FROM python:3.8-alpine3.12
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_buster/Dockerfile.python3.8-buster b/hylang_python3.8-buster/Dockerfile.python3.8-buster
similarity index 80%
rename from hylang_buster/Dockerfile.python3.8-buster
rename to hylang_python3.8-buster/Dockerfile.python3.8-buster
index b5d116b..054bb7d 100644
--- a/hylang_buster/Dockerfile.python3.8-buster
+++ b/hylang_python3.8-buster/Dockerfile.python3.8-buster
@@ -1,6 +1,6 @@
 FROM python:3.8-slim-buster
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir "hy == $HY_VERSION"
 
diff --git a/hylang_windowsservercore-1809/Dockerfile.python3.8-windowsservercore-1809 b/hylang_python3.8-windowsservercore-1809/Dockerfile.python3.8-windowsservercore-1809
similarity index 84%
rename from hylang_windowsservercore-1809/Dockerfile.python3.8-windowsservercore-1809
rename to hylang_python3.8-windowsservercore-1809/Dockerfile.python3.8-windowsservercore-1809
index 2462111..e681817 100644
--- a/hylang_windowsservercore-1809/Dockerfile.python3.8-windowsservercore-1809
+++ b/hylang_python3.8-windowsservercore-1809/Dockerfile.python3.8-windowsservercore-1809
@@ -1,6 +1,6 @@
 FROM python:3.8-windowsservercore-1809
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION)
 
diff --git a/hylang_windowsservercore-ltsc2016/Dockerfile.python3.8-windowsservercore-ltsc2016 b/hylang_python3.8-windowsservercore-ltsc2016/Dockerfile.python3.8-windowsservercore-ltsc2016
similarity index 84%
rename from hylang_windowsservercore-ltsc2016/Dockerfile.python3.8-windowsservercore-ltsc2016
rename to hylang_python3.8-windowsservercore-ltsc2016/Dockerfile.python3.8-windowsservercore-ltsc2016
index 87681b0..1084e59 100644
--- a/hylang_windowsservercore-ltsc2016/Dockerfile.python3.8-windowsservercore-ltsc2016
+++ b/hylang_python3.8-windowsservercore-ltsc2016/Dockerfile.python3.8-windowsservercore-ltsc2016
@@ -1,6 +1,6 @@
 FROM python:3.8-windowsservercore-ltsc2016
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION)
 
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809 b/hylang_windowsservercore-1809/Dockerfile.python3.9-windowsservercore-1809
similarity index 56%
copy from hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
copy to hylang_windowsservercore-1809/Dockerfile.python3.9-windowsservercore-1809
index 4b4245b..52b3561 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
+++ b/hylang_windowsservercore-1809/Dockerfile.python3.9-windowsservercore-1809
@@ -1,6 +1,6 @@
-FROM pypy:3.7-windowsservercore-1809
+FROM python:3.9-windowsservercore-1809
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION)
 
diff --git a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809 b/hylang_windowsservercore-ltsc2016/Dockerfile.python3.9-windowsservercore-ltsc2016
similarity index 54%
copy from hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
copy to hylang_windowsservercore-ltsc2016/Dockerfile.python3.9-windowsservercore-ltsc2016
index 4b4245b..ebfd8f0 100644
--- a/hylang_pypy-windowsservercore-1809/Dockerfile.pypy3.7-windowsservercore-1809
+++ b/hylang_windowsservercore-ltsc2016/Dockerfile.python3.9-windowsservercore-ltsc2016
@@ -1,6 +1,6 @@
-FROM pypy:3.7-windowsservercore-1809
+FROM python:3.9-windowsservercore-ltsc2016
 
-ENV HY_VERSION 0.20.0
+ENV HY_VERSION 1.0a1
 
 RUN pip install --no-cache-dir ('hy == {0}' -f $env:HY_VERSION)