From e4d4e5332c81ab236bbffe11bd9fe0941730360e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 17 Aug 2021 11:56:07 -0700 Subject: [PATCH] Add Debian Bullseye --- ....6-stretch => Dockerfile.pypy3.7-bullseye} | 2 +- .../Dockerfile.python3.10-rc-bullseye | 7 +++ ...-stretch => Dockerfile.python3.6-bullseye} | 2 +- .../Dockerfile.python3.7-bullseye | 7 +++ .../Dockerfile.python3.8-bullseye | 7 +++ .../Dockerfile.python3.9-bullseye | 7 +++ dockerfiles-generated/library-hylang.template | 44 +++++++++++++------ update.sh | 4 +- 8 files changed, 62 insertions(+), 18 deletions(-) rename dockerfiles-generated/{Dockerfile.python3.6-stretch => Dockerfile.pypy3.7-bullseye} (74%) create mode 100644 dockerfiles-generated/Dockerfile.python3.10-rc-bullseye rename dockerfiles-generated/{Dockerfile.python3.7-stretch => Dockerfile.python3.6-bullseye} (74%) create mode 100644 dockerfiles-generated/Dockerfile.python3.7-bullseye create mode 100644 dockerfiles-generated/Dockerfile.python3.8-bullseye create mode 100644 dockerfiles-generated/Dockerfile.python3.9-bullseye diff --git a/dockerfiles-generated/Dockerfile.python3.6-stretch b/dockerfiles-generated/Dockerfile.pypy3.7-bullseye similarity index 74% rename from dockerfiles-generated/Dockerfile.python3.6-stretch rename to dockerfiles-generated/Dockerfile.pypy3.7-bullseye index 627a8ad..2d892e1 100644 --- a/dockerfiles-generated/Dockerfile.python3.6-stretch +++ b/dockerfiles-generated/Dockerfile.pypy3.7-bullseye @@ -1,4 +1,4 @@ -FROM python:3.6-slim-stretch +FROM pypy:3.7-slim-bullseye ENV HY_VERSION 1.0a3 diff --git a/dockerfiles-generated/Dockerfile.python3.10-rc-bullseye b/dockerfiles-generated/Dockerfile.python3.10-rc-bullseye new file mode 100644 index 0000000..9228efc --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.10-rc-bullseye @@ -0,0 +1,7 @@ +FROM python:3.10-rc-slim-bullseye + +ENV HY_VERSION 1.0a3 + +RUN pip install --no-cache-dir "hy == $HY_VERSION" + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.python3.7-stretch b/dockerfiles-generated/Dockerfile.python3.6-bullseye similarity index 74% rename from dockerfiles-generated/Dockerfile.python3.7-stretch rename to dockerfiles-generated/Dockerfile.python3.6-bullseye index f2d8309..83eb704 100644 --- a/dockerfiles-generated/Dockerfile.python3.7-stretch +++ b/dockerfiles-generated/Dockerfile.python3.6-bullseye @@ -1,4 +1,4 @@ -FROM python:3.7-slim-stretch +FROM python:3.6-slim-bullseye ENV HY_VERSION 1.0a3 diff --git a/dockerfiles-generated/Dockerfile.python3.7-bullseye b/dockerfiles-generated/Dockerfile.python3.7-bullseye new file mode 100644 index 0000000..958cacd --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.7-bullseye @@ -0,0 +1,7 @@ +FROM python:3.7-slim-bullseye + +ENV HY_VERSION 1.0a3 + +RUN pip install --no-cache-dir "hy == $HY_VERSION" + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.python3.8-bullseye b/dockerfiles-generated/Dockerfile.python3.8-bullseye new file mode 100644 index 0000000..89e2728 --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.8-bullseye @@ -0,0 +1,7 @@ +FROM python:3.8-slim-bullseye + +ENV HY_VERSION 1.0a3 + +RUN pip install --no-cache-dir "hy == $HY_VERSION" + +CMD ["hy"] diff --git a/dockerfiles-generated/Dockerfile.python3.9-bullseye b/dockerfiles-generated/Dockerfile.python3.9-bullseye new file mode 100644 index 0000000..25b7277 --- /dev/null +++ b/dockerfiles-generated/Dockerfile.python3.9-bullseye @@ -0,0 +1,7 @@ +FROM python:3.9-slim-bullseye + +ENV HY_VERSION 1.0a3 + +RUN pip install --no-cache-dir "hy == $HY_VERSION" + +CMD ["hy"] diff --git a/dockerfiles-generated/library-hylang.template b/dockerfiles-generated/library-hylang.template index d640856..03a92a4 100644 --- a/dockerfiles-generated/library-hylang.template +++ b/dockerfiles-generated/library-hylang.template @@ -3,9 +3,13 @@ GitRepo: https://github.com/hylang/docker-hylang.git GitCommit: %%COMMIT%% Directory: dockerfiles-generated -Tags: 1.0a3-python3.9-buster, python3.9-buster, 1.0a3-buster, buster +Tags: 1.0a3-python3.9-bullseye, python3.9-bullseye, 1.0a3-bullseye, bullseye SharedTags: 1.0a3-python3.9, python3.9, 1.0a3, latest Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x +File: Dockerfile.python3.9-bullseye + +Tags: 1.0a3-python3.9-buster, python3.9-buster, 1.0a3-buster, buster +Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x File: Dockerfile.python3.9-buster Tags: 1.0a3-python3.9-alpine3.14, python3.9-alpine3.14, 1.0a3-alpine3.14, alpine3.14, 1.0a3-python3.9-alpine, python3.9-alpine, 1.0a3-alpine, alpine @@ -28,9 +32,13 @@ Architectures: windows-amd64 Constraints: windowsservercore-ltsc2016 File: Dockerfile.python3.9-windowsservercore-ltsc2016 -Tags: 1.0a3-python3.8-buster, python3.8-buster +Tags: 1.0a3-python3.8-bullseye, python3.8-bullseye SharedTags: 1.0a3-python3.8, python3.8 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x +File: Dockerfile.python3.8-bullseye + +Tags: 1.0a3-python3.8-buster, python3.8-buster +Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x File: Dockerfile.python3.8-buster Tags: 1.0a3-python3.8-alpine3.14, python3.8-alpine3.14, 1.0a3-python3.8-alpine, python3.8-alpine @@ -41,14 +49,14 @@ Tags: 1.0a3-python3.8-alpine3.13, python3.8-alpine3.13 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x File: Dockerfile.python3.8-alpine3.13 -Tags: 1.0a3-python3.7-buster, python3.7-buster +Tags: 1.0a3-python3.7-bullseye, python3.7-bullseye SharedTags: 1.0a3-python3.7, python3.7 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x -File: Dockerfile.python3.7-buster +File: Dockerfile.python3.7-bullseye -Tags: 1.0a3-python3.7-stretch, python3.7-stretch -Architectures: amd64, arm32v5, arm32v7, arm64v8, i386 -File: Dockerfile.python3.7-stretch +Tags: 1.0a3-python3.7-buster, python3.7-buster +Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x +File: Dockerfile.python3.7-buster Tags: 1.0a3-python3.7-alpine3.14, python3.7-alpine3.14, 1.0a3-python3.7-alpine, python3.7-alpine Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x @@ -58,14 +66,14 @@ Tags: 1.0a3-python3.7-alpine3.13, python3.7-alpine3.13 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x File: Dockerfile.python3.7-alpine3.13 -Tags: 1.0a3-python3.6-buster, python3.6-buster +Tags: 1.0a3-python3.6-bullseye, python3.6-bullseye SharedTags: 1.0a3-python3.6, python3.6 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x -File: Dockerfile.python3.6-buster +File: Dockerfile.python3.6-bullseye -Tags: 1.0a3-python3.6-stretch, python3.6-stretch -Architectures: amd64, arm32v5, arm32v7, arm64v8, i386 -File: Dockerfile.python3.6-stretch +Tags: 1.0a3-python3.6-buster, python3.6-buster +Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x +File: Dockerfile.python3.6-buster Tags: 1.0a3-python3.6-alpine3.14, python3.6-alpine3.14, 1.0a3-python3.6-alpine, python3.6-alpine Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x @@ -75,9 +83,13 @@ Tags: 1.0a3-python3.6-alpine3.13, python3.6-alpine3.13 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x File: Dockerfile.python3.6-alpine3.13 -Tags: 1.0a3-python3.10-rc-buster, python3.10-rc-buster +Tags: 1.0a3-python3.10-rc-bullseye, python3.10-rc-bullseye SharedTags: 1.0a3-python3.10-rc, python3.10-rc Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x +File: Dockerfile.python3.10-rc-bullseye + +Tags: 1.0a3-python3.10-rc-buster, python3.10-rc-buster +Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x File: Dockerfile.python3.10-rc-buster Tags: 1.0a3-python3.10-rc-alpine3.14, python3.10-rc-alpine3.14, 1.0a3-python3.10-rc-alpine, python3.10-rc-alpine @@ -88,9 +100,13 @@ Tags: 1.0a3-python3.10-rc-alpine3.13, python3.10-rc-alpine3.13 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x File: Dockerfile.python3.10-rc-alpine3.13 -Tags: 1.0a3-pypy3.7-buster, pypy3.7-buster, 1.0a3-pypy-buster, pypy-buster +Tags: 1.0a3-pypy3.7-bullseye, pypy3.7-bullseye, 1.0a3-pypy-bullseye, pypy-bullseye SharedTags: 1.0a3-pypy3.7, pypy3.7, 1.0a3-pypy, pypy Architectures: amd64, arm64v8, i386, s390x +File: Dockerfile.pypy3.7-bullseye + +Tags: 1.0a3-pypy3.7-buster, pypy3.7-buster, 1.0a3-pypy-buster, pypy-buster +Architectures: amd64, arm64v8, i386, s390x File: Dockerfile.pypy3.7-buster Tags: 1.0a3-pypy3.7-windowsservercore-1809, pypy3.7-windowsservercore-1809, 1.0a3-pypy-windowsservercore-1809, pypy-windowsservercore-1809 diff --git a/update.sh b/update.sh index 9c9303e..536193e 100755 --- a/update.sh +++ b/update.sh @@ -36,7 +36,7 @@ bases=( pypy ) variants=( - buster stretch + bullseye buster stretch alpine3.14 alpine3.13 windowsservercore-1809 windowsservercore-ltsc2016 ) @@ -44,7 +44,7 @@ declare -A variantAliases=( [alpine3.14]='alpine' ) declare -A sharedTags=( - [buster]='latest' + [bullseye]='latest' ) for variant in "${variants[@]}"; do if [[ "$variant" == windowsservercore-* ]]; then sharedTags[$variant]='latest'; fi; done