exporter: make OnBuild omiteempty #4648
Merged
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
1 task
|
Looks like something's broken in CI (I saw a discussion about this, not sure what the outcome was though) |
AkihiroSuda
approved these changes
Feb 14, 2024
|
@AkihiroSuda not sure yet if we want to merge this one; this was mostly for testing if we see the same failures (differences in digests in multiple places?) as the other PR, or if there's other changes that caused them 😅 |
thaJeztah
force-pushed
the
debug_image_spec
branch
from
353ae90 to
c185582
Compare
Aligning with the docker image spec; https://github.com/moby/docker-image-spec/blob/f1d00ebd2d6d6805170d5543dbca4b850f35f9af/specs-go/v1/image.go#L30C19-L30C100 Also adjust the digest in tests, as changing this field results in the digest to change: === FAIL: frontend/dockerfile TestIntegration/TestReproSourceDateEpoch/worker=containerd-1.6/frontend=gateway (11.70s) dockerfile_test.go:6853: SOURCE_DATE_EPOCH=1673354096 dockerfile_test.go:6917: The digest may change depending on the BuildKit version, the snapshotter configuration, etc. dockerfile_test.go:6918: Error Trace: /src/frontend/dockerfile/dockerfile_test.go:6918 /src/util/testutil/integration/run.go:93 /src/util/testutil/integration/run.go:207 Error: Not equal: expected: "sha256:29f2980a804038b0f910af98e9ddb18bfa4d5514995ee6bb4343ddf621a4e183" actual : "sha256:3eb3c164e3420bbfcf52c34f1e40ee66631d69445e934175b779551c729f80df" Diff: --- Expected +++ Actual @@ -1 +1 @@ -sha256:29f2980a804038b0f910af98e9ddb18bfa4d5514995ee6bb4343ddf621a4e183 +sha256:3eb3c164e3420bbfcf52c34f1e40ee66631d69445e934175b779551c729f80df Test: TestIntegration/TestReproSourceDateEpoch/worker=containerd-1.6/frontend=gateway Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
debug_image_spec
branch
from
c185582 to
973d2d9
Compare
|
It looks like CI is green with this change (and adjusting the digest accordingly), so we'd have to look in the other changes in #4634 (comment) to see that's causing the digest of the layers to change 🤔 I squashed the commits in this PR, and maybe we should indeed consider merging this one, and look at #4634 as a follow-up to this. I'll stack that other PR on top of this one, which should also re-run CI on it (perhaps ti was some flakiness?) |
vvoland
approved these changes
Feb 15, 2024
crazy-max
approved these changes
Feb 15, 2024
tonistiigi
approved these changes
Feb 16, 2024
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.
Aligning with the docker image spec;
https://github.com/moby/docker-image-spec/blob/f1d00ebd2d6d6805170d5543dbca4b850f35f9af/specs-go/v1/image.go#L30C19-L30C100