From 216f8477bfe25697d893dd706ee8df3052bd1f4d Mon Sep 17 00:00:00 2001 From: Yoshi Yamaguchi Date: Thu, 19 Dec 2024 17:54:51 +0900 Subject: [PATCH 1/4] chore(ecr-assets): add document about CDK_DOCKER environment variable --- packages/aws-cdk-lib/aws-ecr-assets/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ecr-assets/README.md b/packages/aws-cdk-lib/aws-ecr-assets/README.md index b9d43f2aedbde..bccf2dcc21f6d 100644 --- a/packages/aws-cdk-lib/aws-ecr-assets/README.md +++ b/packages/aws-cdk-lib/aws-ecr-assets/README.md @@ -51,6 +51,11 @@ asset hash. Additionally, you can supply `buildSecrets`. Your system must have Buildkit enabled, see https://docs.docker.com/build/buildkit/. +Also, similary to `@aws-cdk/aws-s3-assets`, you can set the CDK_DOCKER environment +variable in order to provide a custom docker program to execute. This may sometime +be needed when building in environments where the standard docker cannot be executed +(see https://github.com/aws/aws-cdk/issues/8460 for details). + SSH agent sockets or keys may be passed to docker build via `buildSsh`. ```ts @@ -209,5 +214,5 @@ pull images from this repository. If the pulling principal is not in the same account or is an AWS service that doesn't assume a role in your account (e.g. AWS CodeBuild), you must either copy the image to a new repository, or grant pull permissions on the resource policy of the repository. Since the repository is managed by the CDK bootstrap stack, -the following permissions must be granted there, or granted manually on the repository: "ecr:GetDownloadUrlForLayer", +the following permissions must be granted there, or granted manually on the repository: "ecr:GetDownloadUrlForLayer", "ecr:BatchGetImage" and "ecr:BatchCheckLayerAvailability". From c6b8693018e8c0f270965d26b06345998f4f55b7 Mon Sep 17 00:00:00 2001 From: Yoshi Yamaguchi Date: Thu, 19 Dec 2024 20:05:19 +0900 Subject: [PATCH 2/4] Update packages/aws-cdk-lib/aws-ecr-assets/README.md Co-authored-by: Jimmy Gaussen --- packages/aws-cdk-lib/aws-ecr-assets/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ecr-assets/README.md b/packages/aws-cdk-lib/aws-ecr-assets/README.md index bccf2dcc21f6d..6ad1456b6c95a 100644 --- a/packages/aws-cdk-lib/aws-ecr-assets/README.md +++ b/packages/aws-cdk-lib/aws-ecr-assets/README.md @@ -52,7 +52,7 @@ Additionally, you can supply `buildSecrets`. Your system must have Buildkit enabled, see https://docs.docker.com/build/buildkit/. Also, similary to `@aws-cdk/aws-s3-assets`, you can set the CDK_DOCKER environment -variable in order to provide a custom docker program to execute. This may sometime +variable in order to provide a custom Docker executable command or path. This may sometime be needed when building in environments where the standard docker cannot be executed (see https://github.com/aws/aws-cdk/issues/8460 for details). From 5d30a4a63c5c97d710c57eb037e30c5a9c15a31b Mon Sep 17 00:00:00 2001 From: Kaizen Conroy <36202692+kaizencc@users.noreply.github.com> Date: Thu, 19 Dec 2024 16:13:29 -0500 Subject: [PATCH 3/4] Update packages/aws-cdk-lib/aws-ecr-assets/README.md --- packages/aws-cdk-lib/aws-ecr-assets/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ecr-assets/README.md b/packages/aws-cdk-lib/aws-ecr-assets/README.md index 6ad1456b6c95a..19d19322ef92f 100644 --- a/packages/aws-cdk-lib/aws-ecr-assets/README.md +++ b/packages/aws-cdk-lib/aws-ecr-assets/README.md @@ -52,7 +52,7 @@ Additionally, you can supply `buildSecrets`. Your system must have Buildkit enabled, see https://docs.docker.com/build/buildkit/. Also, similary to `@aws-cdk/aws-s3-assets`, you can set the CDK_DOCKER environment -variable in order to provide a custom Docker executable command or path. This may sometime +variable in order to provide a custom Docker executable command or path. This may sometimes be needed when building in environments where the standard docker cannot be executed (see https://github.com/aws/aws-cdk/issues/8460 for details). From b63f9e44ed6bad5a44a050b955df8e0a5d23db08 Mon Sep 17 00:00:00 2001 From: Kaizen Conroy <36202692+kaizencc@users.noreply.github.com> Date: Fri, 27 Dec 2024 15:42:27 -0600 Subject: [PATCH 4/4] Update packages/aws-cdk-lib/aws-ecr-assets/README.md --- packages/aws-cdk-lib/aws-ecr-assets/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/aws-ecr-assets/README.md b/packages/aws-cdk-lib/aws-ecr-assets/README.md index 19d19322ef92f..8b9bedc1d8211 100644 --- a/packages/aws-cdk-lib/aws-ecr-assets/README.md +++ b/packages/aws-cdk-lib/aws-ecr-assets/README.md @@ -51,7 +51,7 @@ asset hash. Additionally, you can supply `buildSecrets`. Your system must have Buildkit enabled, see https://docs.docker.com/build/buildkit/. -Also, similary to `@aws-cdk/aws-s3-assets`, you can set the CDK_DOCKER environment +Also, similarly to `@aws-cdk/aws-s3-assets`, you can set the CDK_DOCKER environment variable in order to provide a custom Docker executable command or path. This may sometimes be needed when building in environments where the standard docker cannot be executed (see https://github.com/aws/aws-cdk/issues/8460 for details).