fix(ecr-assets): docker images are not built if .dockerignore includes an entry that ignores the dockerfile.

[nathanpeck]

This fixes #6004 by ensuring that Dockerfile and .dockerignore will always be added to the asset staging folder, even if included in the .dockerignore file. This obeys the spec according to Docker:

You can even use the .dockerignore file to exclude the Dockerfile and .dockerignore files. These files are still sent to the daemon because it needs them to do its job. But the ADD and COPY instructions do not copy them to the image.

(https://docs.docker.com/engine/reference/builder/)

Note: this PR adds new dependency minimatch to the @aws-cdk/aws-ecr-asset package, in order to do file glob matching. However this package is also used in @aws-cdk/assets so this is not a new dependency for the overall project

---

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

[mergify]

Title does not follow the guidelines of Conventional Commits. Please adjust title before merge.

[aws-cdk-automation]

AWS CodeBuild CI Report

• Result: SUCCEEDED
• Build Logs (available for 30 days)

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

[iliapolo]

One more thing :)

Please include the relevant module in the PR title: fix(esr-assets).

Pull request has been modified.

[nathanpeck]

PR is now updated with support for custom Dockerfile names. Per @iliapolo feedback I have retained the approach of filtering the list of excludes, reduced the explanatory comment verbosity, and reused some existing constants.

Tests were actually already existing on this package, but the tested sample was just missing the right conditions to trigger this bug. I added relevant lines to the .dockerignore files for the existing tests in order to trigger the right conditions for the bug to manifest, verified that the tests broke as expected, added new code to fix the bug, and then verified that the tests went back to passing.

If wanted I can still break this out into its own entirely new separate test case for clarity, but I figured for the sake of conciseness it made sense to just use the existing test cases. It appears those test cases are already being overloaded to do multiple different types of tests for correctness, so it didn't look like this project has a strict 1 to 1 policy for test condition to test case

[aws-cdk-automation]

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]

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]

AWS CodeBuild CI Report

• Result: SUCCEEDED
• Build Logs (available for 30 days)

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

[iliapolo]

@nathanpeck Looks great. Just a small phrasing issue...

We want the PR title to describe the bug itself, and not the solution. That is:

docker images are not built if .dockerignore includes an entry that ignores the docker file.

For example: #5507

This is because this title is then shown in the release notes, and it helps customers clearly
understand what was fixed.

Sorry for not mentioning this before, it just dawned on me.

[mergify]

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