feat(lambda): docker platform for architecture by jogold · Pull Request #16858 · aws/aws-cdk

jogold · 2021-10-07T19:35:33Z

Add a dockerPlatform property in Architecture and use it to pass the
correct platform when bundling in a container in aws-lambda-nodejs,
aws-lambda-go and aws-lambda-python.

Note that the SAM build images (public.ecr.aws/sam/build-<runtime>) are now
multi-arch.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

Add a `dockerPlatform` property in `Architecture` and use it to pass the correct `platform` when bundling in a container in `aws-lambda-nodejs`, `aws-lambda-go` and `aws-lambda-python`.

gitpod-io · 2021-10-07T19:35:35Z

corymhall · 2021-10-07T20:19:30Z

packages/@aws-cdk/aws-lambda-go/lib/bundling.ts

          ...props.buildArgs ?? {},
          IMAGE: Runtime.GO_1_X.bundlingImage.image, // always use the GO_1_X build image
        },
+        platform: props.architecture.dockerPlatform,


You probably need to remove the GOARCH environment variable on line 112 above.

Good catch!

jogold · 2021-10-07T20:30:35Z

packages/@aws-cdk/aws-lambda-go/lib/bundling.ts

      CGO_ENABLED: cgoEnabled,
      GO111MODULE: 'on',
-      GOARCH: 'amd64',
+      GOARCH: props.architecture.dockerPlatform.split('/')[1],


@corymhall what about this?

Even better!

jogold · 2021-10-08T12:57:51Z

@nija-at @eladb can you take a look?

eladb

Looks good

eladb · 2021-10-10T14:14:11Z

packages/@aws-cdk/aws-lambda/lib/architecture.ts

  /**
   * Used to specify a custom architecture name.
   * Use this if the architecture name is not yet supported by the CDK.
   * @param name the architecture name as recognized by AWS Lambda.


Missing docstring for param

eladb · 2021-10-10T14:14:53Z

packages/@aws-cdk/aws-lambda/lib/architecture.ts

+   */
+  public readonly dockerPlatform: string;
+
+  private constructor(archName: string, dockerPlatform?: string) {


For safety, maybe make explicit:

Suggested change

private constructor(archName: string, dockerPlatform?: string) {

private constructor(archName: string, dockerPlatform: string) {

eladb

Does this resolve #12472?

Pull request has been modified.

jogold · 2021-10-11T09:34:43Z

Does this resolve #12472?

No, #16770 will.

#12472 is about docker build in cdk-assets.

Can you reapprove? The build will now pass (now that 1.127.0 was merged back).

mergify · 2021-10-11T10:22:16Z

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

aws-cdk-automation · 2021-10-11T11:17:54Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
Commit ID: 3df2d09
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

mergify · 2021-10-11T11:18:11Z

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

Add a `dockerPlatform` property in `Architecture` and use it to pass the correct `platform` when bundling in a container in `aws-lambda-nodejs`, `aws-lambda-go` and `aws-lambda-python`. Note that the SAM build images (`public.ecr.aws/sam/build-<runtime>`) are now multi-arch. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

…ker images (#20439) This PR adds support for specifying the desired build platform when building docker images (ie: build an arm64 image on an amd64/x86_64 host). Closes #12472 This PR does NOT touch Lambda builders, only ECR assets. #16770 attempted to implement support for ECR and Lambda but was abandoned. Meanwhile #16858 implemented lambda platform support. This implements the ECR side I have run `yarn integ` ---- ### All Submissions: * [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/master/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [x] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/master/INTEGRATION_TESTS.md)? * [x] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

feat(lambda): docker platform for architecture

df2ad6d

Add a `dockerPlatform` property in `Architecture` and use it to pass the correct `platform` when bundling in a container in `aws-lambda-nodejs`, `aws-lambda-go` and `aws-lambda-python`.

jogold mentioned this pull request Oct 7, 2021

(assets): allow user to pass platform option to Docker builds #12472

Closed

2 tasks

README

93dc02a

corymhall reviewed Oct 7, 2021

View reviewed changes

GOARCH

52dbdc3

jogold commented Oct 7, 2021

View reviewed changes

jaresuth approved these changes Oct 8, 2021

View reviewed changes

eladb reviewed Oct 10, 2021

View reviewed changes

jogold added 3 commits October 11, 2021 09:40

PR feedback

b96e24d

Merge branch 'master' into lambda-arch-bundling-image

e0eb2dc

JSDoc

c9a53f2

jogold requested a review from eladb October 11, 2021 07:43

eladb previously approved these changes Oct 11, 2021

View reviewed changes

Merge branch 'master' into lambda-arch-bundling-image

54e68a7

eladb approved these changes Oct 11, 2021

View reviewed changes

Merge branch 'master' into lambda-arch-bundling-image

3df2d09

mergify bot merged commit 5c258a3 into aws:master Oct 11, 2021

jogold deleted the lambda-arch-bundling-image branch October 11, 2021 11:54

joeflateau mentioned this pull request May 20, 2022

feat(aws-ecr-assets): support the --platform option when building docker images #20439

Merged

4 tasks

	private constructor(archName: string, dockerPlatform?: string) {
	private constructor(archName: string, dockerPlatform: string) {

Conversation

jogold commented Oct 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gitpod-io bot commented Oct 7, 2021

Uh oh!

corymhall Oct 7, 2021

Choose a reason for hiding this comment

Uh oh!

jogold Oct 7, 2021

Choose a reason for hiding this comment

Uh oh!

jogold Oct 7, 2021

Choose a reason for hiding this comment

Uh oh!

corymhall Oct 8, 2021

Choose a reason for hiding this comment

Uh oh!

jogold commented Oct 8, 2021

Uh oh!

eladb left a comment

Choose a reason for hiding this comment

Uh oh!

eladb Oct 10, 2021

Choose a reason for hiding this comment

Uh oh!

eladb Oct 10, 2021

Choose a reason for hiding this comment

Uh oh!

eladb left a comment

Choose a reason for hiding this comment

Uh oh!

jogold commented Oct 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mergify bot commented Oct 11, 2021

Uh oh!

aws-cdk-automation commented Oct 11, 2021

AWS CodeBuild CI Report

Uh oh!

mergify bot commented Oct 11, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jogold commented Oct 7, 2021 •

edited

Loading

jogold commented Oct 11, 2021 •

edited

Loading