Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(core,s3-assets): custom bundling docker command #8481

Merged
merged 7 commits into from
Jun 11, 2020
Merged

feat(core,s3-assets): custom bundling docker command #8481

merged 7 commits into from
Jun 11, 2020

Conversation

eladb
Copy link
Contributor

@eladb eladb commented Jun 10, 2020

In order to support environments in which docker cannot be executed or has a unique location, we added an environment variable CDK_DOCKER which is used instead of docker if defined.

Resolves #8460

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

feat(core,s3-assets): custom bundling docker command
81a6606 
In order to support environments in which docker cannot be executed or has a unique location, we added an environment variable `CDK_DOCKER` which is used instead of `docker` if defined.

Resolves #8460
@eladb eladb requested a review from a team June 10, 2020 17:23
@eladb eladb self-assigned this Jun 10, 2020
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jun 10, 2020
@eladb
Copy link
Contributor Author

eladb commented Jun 10, 2020

@jogold what do you think?

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: 81a6606
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: d8af8cb
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: ff6b690
  • Result: FAILED
  • Build Logs (available for 30 days)

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

jogold
jogold reviewed Jun 10, 2020
View reviewed changes
Copy link
Contributor

@jogold jogold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Isn't it easier to test in test.bundling.ts where spawnSync is already stubbed?

packages/@aws-cdk/core/lib/asset-staging.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/test/test.staging.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/test/test.staging.ts Outdated Show resolved Hide resolved
Elad Ben-Israel and others added 2 commits June 10, 2020 22:32
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: e576a1f
  • Result: FAILED
  • Build Logs (available for 30 days)

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

@eladb
Copy link
Contributor Author

eladb commented Jun 10, 2020

Looks good.

Isn't it easier to test in test.bundling.ts where spawnSync is already stubbed?

I actually wanted to avoid running docker in unit tests altogether but didn't want to lose coverage.

@jogold
Copy link
Contributor

jogold commented Jun 10, 2020

Looks good.
Isn't it easier to test in test.bundling.ts where spawnSync is already stubbed?

I actually wanted to avoid running docker in unit tests altogether but didn't want to lose coverage.

OK!

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: ecc09c2
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@jogold jogold mentioned this pull request Jun 11, 2020
Merged
@mergify
Copy link
Contributor

mergify bot commented Jun 11, 2020

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).

@mergify
Copy link
Contributor

mergify bot commented Jun 11, 2020

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).

@mergify mergify bot merged commit 2a6d90c into master Jun 11, 2020
@mergify mergify bot deleted the benisrae/custom-docker branch June 11, 2020 11:35
@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: bbf5b84
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@jogold jogold mentioned this pull request Jul 8, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@njlynch njlynch njlynch approved these changes

@jogold jogold jogold approved these changes

Assignees

@eladb eladb

Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Customize asset bundling execution
4 participants
@eladb @aws-cdk-automation @jogold @njlynch