commit: add --source-date-epoch and --rewrite-timestamp flags#6189
Merged
openshift-merge-bot[bot] merged 1 commit intocontainers:mainfrom Jun 4, 2025
Merged
Conversation
openshift-ci
bot
added
kind/feature
nalind
force-pushed
the
commit-source-date-epoch
branch
6 times, most recently
from
8507637 to
1c201ea
Compare
flouthoc
reviewed
Jun 4, 2025
cmd/buildah/commit.go
Outdated
| options.HistoryTimestamp = ×tamp | ||
| } | ||
| if exclusiveFlags > 1 { | ||
| return errors.New("can not use more then one timestamp option at at time") |
Collaborator
There was a problem hiding this comment.
Suggested change
| return errors.New("can not use more then one timestamp option at at time") | |
| return errors.New("cannot use more then one timestamp option at at time") |
nit
flouthoc
reviewed
Jun 4, 2025
tests/commit.bats
Outdated
| run_buildah add --add-history "$cid" $TEST_SCRATCH_DIR/context/* /context | ||
| # commit using defaults | ||
| run_buildah commit "$cid" oci:$TEST_SCRATCH_DIR/default | ||
| # commit with an implicity-provided timestamp |
Collaborator
There was a problem hiding this comment.
Suggested change
| # commit with an implicity-provided timestamp | |
| # commit with an implicitly-provided timestamp |
flouthoc
reviewed
Jun 4, 2025
| return diff.Name(), digester.Digest(), counter.Count, nil | ||
| } | ||
|
|
||
| func makeFilteredLayerWriteCloser(wc io.WriteCloser, layerModTime, layerLatestModTime *time.Time) io.WriteCloser { |
Collaborator
There was a problem hiding this comment.
Nit: A small comment about this function will be helpful documenting precedence order between layerModTime and layerLatestModTime ?
flouthoc
approved these changes
Jun 4, 2025
Collaborator
flouthoc
left a comment
flouthoc
left a comment
There was a problem hiding this comment.
PR LGTM just small nits and one question.
nalind
force-pushed
the
commit-source-date-epoch
branch
from
1c201ea to
a013447
Compare
Add a --source-date-epoch flag, defaulting to $SOURCE_DATE_EPOCH if set, which sets the created-on date and the timestamp for the new history entries, but does not default to modifying the timestamps on contents in new layers. Add a --rewrite-timestamp flag, which "clamps" timestamps in the new layers to not be later than the --source-date-epoch value if both the --rewrite-timestamp and --source-date-epoch flags were set. Signed-off-by: Nalin Dahyabhai <[email protected]>
nalind
force-pushed
the
commit-source-date-epoch
branch
from
a013447 to
6c82e7e
Compare
|
Ephemeral COPR build failed. @containers/packit-build please check. |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: flouthoc, nalind The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Collaborator
Member
|
LGTM |
Member
|
/lgtm |
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
What type of PR is this?
/kind feature
What this PR does / why we need it:
Add a
--source-date-epoch flag, defaulting to$SOURCE_DATE_EPOCHif set, which sets the created-on date and the timestamp for the new history entries, but does not default to modifying the timestamps on contents in new layers.Add a
--rewrite-timestampflag, which "clamps" timestamps in the new layers to not be later than the--source-date-epochvalue if both the--rewrite-timestampand--source-date-epochflags were set.How to verify it
New integration tests!
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
Does this PR introduce a user-facing change?