build: ensure empty build/rpms directory is included in build context #2784
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Whether intentionally or not, Docker 23 subtly changed the handling of
negated patterns in `.dockerignore` files. In our case,
/build/*
!/build/rpms/*.rpm
will not include `build/rpms` in the build context with Docker 23 if
the `build/rpms` is empty. This breaks the build since the directory is
expected to exist in any case.
Add a couple extra patterns that amount to the desired behavior, whether
run with Docker 23 or prior versions.
Signed-off-by: Markus Boehme <[email protected]>
etungsten
approved these changes
Feb 7, 2023
webern
approved these changes
Feb 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
Closes #2783
Description of changes:
Whether intentionally or not, Docker 23 subtly changed the handling of negated patterns in
.dockerignorefiles. In our case,will not include
build/rpmsin the build context with Docker 23 if thebuild/rpmsis empty. This breaks the build since the directory is expected to exist in any case.Add a couple extra patterns that amount to the desired behavior, whether run with Docker 23 or prior versions.
Testing done: Ran builds with Docker 20 and 23, with RPMs from prior builds in
build/rpmsafter runningcargo make cleanto remove them. All builds succeeded.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.