diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5603ed8da4..5c59f64f2a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -163,14 +163,14 @@ The [Python](./packages/jsii-pacmak/lib/targets/python.ts) target is a good example to work from. ## Releasing -### The `jsii/superchain` Docker image +### The `public.ecr.aws/jsii/superchain` Docker image -Upon merging new changes to the `main` branch, the `jsii/superchain:nightly` -image will be released by TravisCI after a last validation build. +Upon merging new changes to the `main` branch, the `public.ecr.aws/jsii/superchain:1-buster-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 `jsii/superchain:latest` image will -be released by TravisCI after a last validation build. +corresponding git tag - is created), the `public.ecr.aws/jsii/superchain:1-buster-slim` image will +be released after a last validation build. The latest release information (for both of the Docker image tags) can be seen -on [Docker Hub](https://hub.docker.com/r/jsii/superchain/tags) +on [ECR Public Gallery](https://gallery.ecr.aws/jsii/superchain) diff --git a/README.md b/README.md index b08b239b8c..404796efa4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![All Contributors](https://img.shields.io/github/all-contributors/aws/jsii/main?label=%E2%9C%A8%20All%20Contributors)](#contributors-) [![Build Status](https://github.com/aws/jsii/workflows/Main/badge.svg)](https://github.com/aws/jsii/actions?query=workflow%3AMain+branch%3Amain) [![npm](https://img.shields.io/npm/v/jsii?logo=npm)](https://www.npmjs.com/package/jsii) -[![docker](https://img.shields.io/badge/docker-jsii%2Fsuperchain-brightgreen?logo=docker)](https://hub.docker.com/r/jsii/superchain) +[![docker](https://img.shields.io/badge/Docker-public.ecr.aws%2Fjsii%2Fsuperchain-brightgreen?logo=docker)](https://gallery.ecr.aws/jsii/superchain) ## Overview diff --git a/gh-pages/content/specification/5-new-language-intake.md b/gh-pages/content/specification/5-new-language-intake.md index 52c970a17a..218399e58b 100644 --- a/gh-pages/content/specification/5-new-language-intake.md +++ b/gh-pages/content/specification/5-new-language-intake.md @@ -59,13 +59,13 @@ code can be written. This component must be written in the new language. Once code is generated and it has a _host_ runtime library to rely on, [`jsii-pacmak`] needs to receive the additional logic required to compile and package the generated libraries as required, producing ready-to-publish artifacts. -The necessary toolchain needs to be added to the [`jsii/superchain`] _Docker_ image, so that `jsii` customers can rely +The necessary toolchain needs to be added to the [`public.ecr.aws/jsii/superchain`] _Docker_ image, so that `jsii` customers can rely on this to build artifacts for any of the supported languages. In addition to this, standardized _Amazon CodePipeline_ actions need to be developed in order to support publishing to the relevant idiomatic package managers. -[`jsii/superchain`]: https://github.com/aws/jsii/tree/main/superchain +[`public.ecr.aws/jsii/superchain`]: https://github.com/aws/jsii/tree/main/superchain ## Compliance Tests diff --git a/gh-pages/content/user-guides/language-support/index.md b/gh-pages/content/user-guides/language-support/index.md index f53ad0cd72..03b9dcc5c5 100644 --- a/gh-pages/content/user-guides/language-support/index.md +++ b/gh-pages/content/user-guides/language-support/index.md @@ -105,8 +105,8 @@ possible to publish artifacts even when tests in the suite are failing. As soon ## Building & Packaging -The necessary toolchains should be added to he [`jsii/superchain`] Docker image, so that the [`jsii-pacmak`] generation -can be changed to support building ready to publish artifacts instead of just code. +The necessary toolchains should be added to he [`public.ecr.aws/jsii/superchain`] Docker image, so that the +[`jsii-pacmak`] generation can be changed to support building ready to publish artifacts instead of just code. Before publishing any artifacts, ensure all packages (the _host library_ as well as generated artifacts) are designated as _experimental_ (e.g: **Python** packages were annotated with the `Development Status :: 4 - Beta` trove classifier on @@ -165,7 +165,7 @@ declared _Generally Available_. At this point, breaking changes are no longer po [`jsii-pacmak`]: ../../packages/jsii-pacmak [`jsii-rosetta`]: ../../packages/jsii-rosetta [standard compliance suite]: ../../specification/4-standard-compliance-suite.md -[`jsii/superchain`]: ../../superchain +[`public.ecr.aws/jsii/superchain`]: ../../superchain [`aws-delivlib`]: https://github.com/awslabs/aws-delivlib [aws cdk]: https://github.com/aws/aws-cdk [semantic versioning]: https://semver.org diff --git a/superchain/Dockerfile b/superchain/Dockerfile index 4d7159c9a2..0c3427e3d4 100644 --- a/superchain/Dockerfile +++ b/superchain/Dockerfile @@ -39,7 +39,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sou SHELL ["/bin/zsh", "-c"] # Prepare maven binary distribution -ARG M2_VERSION="3.9.0" +ARG M2_VERSION="3.9.1" ENV M2_DISTRO="https://www.apache.org/dist/maven/maven-3" RUN set -eo pipefail \ && curl -fSsL "${M2_DISTRO}/${M2_VERSION}/binaries/apache-maven-${M2_VERSION}-bin.tar.gz" \ @@ -250,7 +250,7 @@ COPY superchain /docker-source # Create the attributions document RUN RUST_DOCS="${RUSTUP_HOME}/toolchains/$(rustup show active-toolchain | cut -d' ' -f 1)/share/doc" \ && RUSTUP_VERSION=$(rustup --version 2>/dev/null | cut -d' ' -f2) \ - && echo "This jsii/superchain image includes the following third-party software/licensing:" > /NOTICE \ + && echo "This public.ecr.aws/jsii/superchain image includes the following third-party software/licensing:" > /NOTICE \ && echo "" >> /NOTICE \ # Start with the packages that didn't come from "apt-get" or don't have a copyright file && echo "################################################################################" >> /NOTICE \ diff --git a/superchain/README.md b/superchain/README.md index 5755d1f4bc..a53ccb97e8 100644 --- a/superchain/README.md +++ b/superchain/README.md @@ -3,7 +3,7 @@ A [`debian:10-slim`][debian]-based Docker image bundling all the SDKs and tools required in order to package [jsii] projects in all supported languages. -[debian]: https://hub.docker.com/_/debian +[debian]: https://gallery.ecr.aws/debian/debian [jsii]: https://github.com/aws/jsii ## Included Language SDKs @@ -23,7 +23,7 @@ SDK | Version Maintained image tags are named using the following pattern: ``` -jsii/superchain:-(-node)(-nightly) +public.ecr.aws/jsii/superchain:-(-node)(-nightly) ``` - `` is the major line of the jsii toolchain @@ -52,9 +52,9 @@ The previous image tags have been discontinued: We build multiple versions of this image, for different versions of Node. They are available as: -* `jsii/superchain:1-buster-slim-node14(-nightly)` -* `jsii/superchain:1-buster-slim-node16(-nightly)` -* `jsii/superchain:1-buster-slim-node18(-nightly)` +* `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)` If you are building this image from source, you can control the Node version with the `NODE_MAJOR_VERSION` build argument: diff --git a/superchain/build-local.sh b/superchain/build-local.sh index ae12f7bff8..a933324dd2 100755 --- a/superchain/build-local.sh +++ b/superchain/build-local.sh @@ -27,6 +27,6 @@ docker build --build-arg BUILD_TIMESTAMP=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ --build-arg REGISTRY="docker.io/library" \ --build-arg COMMIT_ID=${COMMIT_ID} \ - -t "jsii/superchain:local" \ + -t "public.ecr.aws/jsii/superchain:local" \ -f ${PWD}/Dockerfile \ ..