Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

fix test suite for Docker BuildKit #1707

Merged
merged 3 commits into from
Aug 29, 2023
Merged

fix test suite for Docker BuildKit #1707

merged 3 commits into from
Aug 29, 2023

Conversation

reidpr
Copy link
Collaborator

@reidpr reidpr commented Aug 18, 2023

As of version 23, Docker’s legacy builder is deprecated and BuildKit is the default. This breaks a number of assumptions in the test suite, both functional and cosmetic. In recent weeks, the updated Docker has appeared in the GitHub Actions image.

This PR updates the test suite to pass again under Docker.

@reidpr reidpr added this to the 0.34 milestone Aug 18, 2023
@reidpr reidpr self-assigned this Aug 18, 2023
@reidpr reidpr changed the title deal with Docker’s changed COPY behavior fix test suite for Docker BuildKit Aug 22, 2023
@reidpr reidpr requested a review from lucaudill August 23, 2023 23:07

# Copy in the new directory tree. In all of these cases, the source simply
# overwrites the destination; symlinks are not followed.
# NOTE: Not currently tested (see #1707).
Copy link
Collaborator

Choose a reason for hiding this comment

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

You might want to add some extra context for this comment chunk, particularly the commented out Dockerfile instruction that's still included.

@@ -590,6 +591,10 @@ EOF
fi
prerequisites_ok argenv

sed_ () {
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think explaining this function in a comment would be good since the regex is a bit intimidating.

@reidpr reidpr requested a review from lucaudill August 29, 2023 19:06
Copy link
Collaborator

@lucaudill lucaudill 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 to me!

@reidpr reidpr merged commit e5937b2 into master Aug 29, 2023
@reidpr reidpr deleted the docker-copy branch September 1, 2023 21:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants