Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim trailing path separators from WORKDIR values #283

Merged

Conversation

nalind
Copy link
Member

@nalind nalind commented Jun 3, 2024

Compatibility requires that we trim trailing path separators from WORKDIR values. This should resolve containers/buildah#5526 (comment).

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 3, 2024
dispatchers.go Outdated
@@ -372,6 +372,10 @@ func workdir(b *Builder, args []string, attributes map[string]bool, flagArgs []s
workdir = filepath.Join(string(os.PathSeparator), current, workdir)
}

if trimmed := strings.TrimSuffix(workdir, string(os.PathSeparator)); trimmed != "" {
Copy link
Contributor

Choose a reason for hiding this comment

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

This code is a a little confusing, would

if workdir != os.PathSepator {
   workdir= strings.TrimSuffix(workdir, string(os.PathSeparator))
} 

Make easier to understand?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sure.

@rhatdan
Copy link
Contributor

rhatdan commented Jun 3, 2024

LGTM other then small code suggestion.

@nalind nalind force-pushed the workdir-trailing-separator branch from 89820cc to 48647b3 Compare June 3, 2024 16:04
Compatibility requires that we trim trailing path separators from
WORKDIR values.

Update a test that refers to a git repository to catch up with that
repository's contents.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@nalind nalind force-pushed the workdir-trailing-separator branch from 48647b3 to 8fca88b Compare June 3, 2024 17:17
Copy link
Contributor

openshift-ci bot commented Jun 3, 2024

@nalind: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@rhatdan
Copy link
Contributor

rhatdan commented Jun 3, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2024
Copy link
Contributor

openshift-ci bot commented Jun 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nalind, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@TomSweeneyRedHat
Copy link
Contributor

LGTM

@openshift-merge-bot openshift-merge-bot bot merged commit 19da76b into openshift:master Jun 3, 2024
3 checks passed
@nalind nalind deleted the workdir-trailing-separator branch June 3, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants