feat(ecr-assets): Support .dockerignore (faster Docker builds) by parisholley · Pull Request #4104 · aws/aws-cdk

parisholley · 2019-09-16T19:56:04Z

If your Dockerfile lives in the project root, CDK will copy ALL files (node_modules, etc) into the cdk out folder prior to running the docker build command (which is super slow). Docker has support for a .dockerignore file that ignores files/directories when building the context:

https://docs.docker.com/engine/reference/builder/#dockerignore-file

mergify · 2019-09-16T19:56:40Z

Thanks so much for taking the time to contribute to the AWS CDK ❤️

We will shortly assign someone to review this pull request and help get it
merged. In the meantime, please take a minute to make sure you follow this
checklist:

PR title type(scope): text
- type: fix, feat, refactor go into CHANGELOG, chore is hidden
- scope: name of module without aws- or cdk- prefix or postfix (e.g. s3 instead of aws-s3-deployment)
- text: use all lower-case, do not end with a period, do not include issue refs
PR Description
- Rationale: describe rationale of change and approach taken
- Issues: indicate issues fixed via: fixes #xxx or closes #xxx
- Breaking?: last paragraph: BREAKING CHANGE: <describe what changed + link for details>
Testing
- Unit test added. Prefer to add a new test rather than modify existing tests
- CLI or init templates change? Re-run/add CLI integration tests
Documentation
- README: update module README to describe new features
- API docs: public APIs must be documented. Copy from official AWS docs when possible
- Design: for significant features, follow design process

aws-cdk-automation · 2019-09-16T20:04:38Z

AWS CodeBuild CI Report

Result: FAILED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-16T23:55:55Z

AWS CodeBuild CI Report

Result: FAILED
Build Logs (available for 30 days)

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

eladb

Please follow the PR checklist and let us know when this is ready for a review.

Pull request has been modified.

aws-cdk-automation · 2019-09-19T17:50:23Z

AWS CodeBuild CI Report

Result: FAILED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-19T20:18:16Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

parisholley · 2019-09-19T22:56:31Z

@rix0rrr @eladb g2g

aws-cdk-automation · 2019-09-19T23:35:36Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

eladb

Please revert all unnecessary changes and add an explicit test to verify .dockerignore behavior

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts

Pull request has been modified.

parisholley · 2019-09-20T14:09:39Z

@eladb done, sounds like we need some lint updates :)

aws-cdk-automation · 2019-09-20T14:47:58Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-20T14:49:16Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-20T14:49:37Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-20T14:50:00Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-20T14:50:04Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

mergify · 2019-09-22T08:54:25Z

Thank you for contributing! Your pull request is now being automatically merged.

aws-cdk-automation · 2019-09-22T09:34:27Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

* Support .dockerignore (faster Docker builds) * ts fix * test update and lint fix * exclude dockerignore so it does not influence hashing * tweaks * remove verify from other test * revert * more revert

kolomied · 2019-10-09T22:29:46Z

It seems we do not handle common "exclude everything except" pattern for .dockerignore files (Docker docs):

# Ignore everything
*
# Allow files and directories
!/src/**

With the current implementation the first 'star' glob effectively excludes everything from the asset folder.

@rix0rrr @eladb - guys, should I create an issue?

yurigorokhov · 2020-06-17T00:25:58Z

bump, regarding not supporting pattern @kolomied brought up.

kolomied · 2020-06-17T08:58:07Z

@yurigorokhov I believe the problem was addressed in #4450

Support .dockerignore (faster Docker builds)

d824cc9

parisholley requested a review from rix0rrr as a code owner September 16, 2019 19:56

parisholley changed the title ~~Support .dockerignore (faster Docker builds)~~ feat(ecr-assets): Support .dockerignore (faster Docker builds) Sep 16, 2019

ts fix

a77d0b7

eladb previously requested changes Sep 17, 2019

View reviewed changes

rix0rrr assigned eladb Sep 19, 2019

test update and lint fix

da0b3eb

exclude dockerignore so it does not influence hashing

fb9d82c

Merge branch 'master' into patch-1

fa5d8f3

eladb previously requested changes Sep 20, 2019

View reviewed changes

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts Outdated Show resolved Hide resolved

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts Outdated Show resolved Hide resolved

packages/@aws-cdk/aws-ecr-assets/lib/image-asset.ts Outdated Show resolved Hide resolved

parisholley added 2 commits September 20, 2019 10:07

tweaks

a61362b

Merge branch 'patch-1' of github.com:parisholley/aws-cdk into patch-1

737974c

parisholley added 3 commits September 20, 2019 10:08

remove verify from other test

08fd079

revert

ee7b6b4

more revert

b1a8fbb

Merge branch 'master' into patch-1

b0366a7

eladb approved these changes Sep 22, 2019

View reviewed changes

Merge branch 'master' into patch-1

bf1e90f

mergify bot merged commit 8389eeb into aws:master Sep 22, 2019

kolomied mentioned this pull request Oct 10, 2019

ecr-assets: incomplete .dockerignore support #4450

Closed

iliapolo mentioned this pull request Jan 20, 2020

docker assets: cannot build docker images outside the source tree (i.e. against a cdk.out directory) #5807

Closed

anguslees mentioned this pull request Mar 24, 2020

DockerImageAsset dockerignore handling anchors globs incorrectly #6964

Closed

Conversation

parisholley commented Sep 16, 2019

Uh oh!

mergify bot commented Sep 16, 2019

Uh oh!

aws-cdk-automation commented Sep 16, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 16, 2019

AWS CodeBuild CI Report

Uh oh!

eladb left a comment

Choose a reason for hiding this comment

Uh oh!

aws-cdk-automation commented Sep 19, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 19, 2019

AWS CodeBuild CI Report

Uh oh!

parisholley commented Sep 19, 2019

Uh oh!

aws-cdk-automation commented Sep 19, 2019

AWS CodeBuild CI Report

Uh oh!

eladb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

parisholley commented Sep 20, 2019

Uh oh!

aws-cdk-automation commented Sep 20, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 20, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 20, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 20, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 20, 2019

AWS CodeBuild CI Report

Uh oh!

mergify bot commented Sep 22, 2019

Uh oh!

aws-cdk-automation commented Sep 22, 2019

AWS CodeBuild CI Report

Uh oh!

kolomied commented Oct 9, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yurigorokhov commented Jun 17, 2020

Uh oh!

kolomied commented Jun 17, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

kolomied commented Oct 9, 2019 •

edited

Loading