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.

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

feat(core): Allow passing Docker build secrets #23778

Conversation

danwiltshire
Copy link
Contributor

Partially closes #14910 and #14395

All Submissions:

Adding new Construct Runtime Dependencies:

  • This PR adds new construct runtime dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • 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

@gitpod-io
Copy link

gitpod-io bot commented Jan 21, 2023

@github-actions github-actions bot added effort/small Small work item – less than a day of effort feature-request A feature should be added or improved. p1 beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK labels Jan 21, 2023
@aws-cdk-automation aws-cdk-automation requested a review from a team January 21, 2023 20:59
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

@aws-cdk-automation aws-cdk-automation dismissed their stale review January 21, 2023 21:05

✅ Updated pull request passes all PRLinter validations. Dissmissing previous PRLinter review.

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts Outdated Show resolved Hide resolved
packages/@aws-cdk/core/lib/bundling.ts Show resolved Hide resolved
packages/@aws-cdk/core/lib/assets.ts Show resolved Hide resolved
@mergify mergify bot dismissed comcalvi’s stale review February 8, 2023 07:19

Pull request has been modified.

yarn.lock Outdated Show resolved Hide resolved
packages/@aws-cdk/core/lib/assets.ts Show resolved Hide resolved
packages/@aws-cdk/core/lib/bundling.ts Show resolved Hide resolved
@mergify mergify bot dismissed comcalvi’s stale review February 9, 2023 07:03

Pull request has been modified.

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2023

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

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 4bc3a97
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify mergify bot merged commit 74512fa into aws:main Feb 10, 2023
@mergify
Copy link
Contributor

mergify bot commented Feb 10, 2023

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

@@ -54,6 +55,7 @@ export class Docker {
const buildCommand = [
'build',
...flatten(Object.entries(options.buildArgs || {}).map(([k, v]) => ['--build-arg', `${k}=${v}`])),
...flatten(Object.entries(options.buildSecrets || {}).map(([k, v]) => ['--secret', `id=${k},${v}`])),
Copy link

Choose a reason for hiding this comment

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

@danwiltshire sorry for reaching you out in a already merged PR, but shouldn't it be id=${k},src=${v} instead? It seems to be that docker cli always expect it to be a key pair with key and value.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for catching this @abilun! Would you be able to submit a follow-up PR to fix this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hello, when used with DockerBuildSecret, its method(s) specify the src=.

DockerBuildSecret.fromSrc(...)

Happy for any changes to be made though.

Edit: There is another Issue #24691 asking for fromEnvironment which I partially completed before the repo refactor.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK effort/small Small work item – less than a day of effort feature-request A feature should be added or improved. p1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ecr-assets: can't use docker build options like --ssh/--secret available when BUILDKIT is enabled
4 participants