From 7197b4f21e7f6776fbbfe5bac7f03a308cd9f7c0 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Tue, 14 Nov 2023 14:48:08 +0000 Subject: [PATCH] feat(superchain): publish a bullseye image with node18 & python 3.9 (#4326) This will become the new default for most use cases. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- .github/workflows/docker-images.yml | 3 +-- CONTRIBUTING.md | 5 +++-- superchain/README.md | 20 ++++++-------------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index b9daa0fc3b..3df903d346 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -23,10 +23,9 @@ jobs: matrix: debian: - 'buster' # 10 + - 'bullseye' # 11 node: ['18', '20'] include: - - debian: 'bullseye' # 11 - node: '20' - debian: 'bookworm' #12 node: '20' env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d313502da..e83234bd5b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -228,13 +228,14 @@ The [Python](./packages/jsii-pacmak/lib/targets/python.ts) target is a good example to work from. ## Releasing + ### The `public.ecr.aws/jsii/superchain` Docker image -Upon merging new changes to the `main` branch, the `public.ecr.aws/jsii/superchain:1-buster-slim-nightly` +Upon merging new changes to the `main` branch, the `public.ecr.aws/jsii/superchain:1-bullseye-slim-nightly` image will be released after a last validation build. Upon making a new `jsii` release (when the GitHub release entry - and its -corresponding git tag - is created), the `public.ecr.aws/jsii/superchain:1-buster-slim` image will +corresponding git tag - is created), the `public.ecr.aws/jsii/superchain:1-bullseye-slim` image will be released after a last validation build. The latest release information (for both of the Docker image tags) can be seen diff --git a/superchain/README.md b/superchain/README.md index a50226a9e2..c1a718be7b 100644 --- a/superchain/README.md +++ b/superchain/README.md @@ -38,16 +38,10 @@ public.ecr.aws/jsii/superchain:-(-node)(-nightly) The previous image tags have been discontinued: -- `:latest` (users should migrate to `:1-buster-slim`) -- `:nightly` (users should migrate to `:1-buster-slim-nightly`) -- `:node10` (users should migrate to `:1-buster-slim-node18`) -- `:node10-nightly` (users should migrate to `:1-buster-slim-node18-nightly`) -- `:node12` (users should migrate to `:1-buster-slim-node18`) -- `:node12-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`) -- `:node14` (users should migrate to `:1-buster-slim-node18`) -- `:node14-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`) -- `:node16` (users should migrate to `:1-buster-slim-node18`) -- `:node16-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`) +- `:latest` (users should migrate to `:1-bullseye-slim`) +- `:nightly` (users should migrate to `:1-bullseye-slim-nightly`) +- `:nodeX` (users should migrate to an image using a supported node version) +- `:nodeX-nightly` (users should migrate to a nightly image using a supported node version) ## Building @@ -68,10 +62,8 @@ jsii$ docker build . -f superchain/Dockerfile -t jsii/superchain:local --target= We build multiple versions of this image, for different versions of Node. They are available as: -* `public.ecr.aws/jsii/superchain:1-buster-slim-node14(-nightly)` -* `public.ecr.aws/jsii/superchain:1-buster-slim-node16(-nightly)` -* `public.ecr.aws/jsii/superchain:1-buster-slim-node18(-nightly)` -* `public.ecr.aws/jsii/superchain:1-buster-slim-node20(-nightly)` +* `public.ecr.aws/jsii/superchain:1-bullseye-slim-node18(-nightly)` +* `public.ecr.aws/jsii/superchain:1-bullseye-slim-node20(-nightly)` If you are building this image from source, you can control the Node version with the `NODE_MAJOR_VERSION` build argument: