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.

Sign up for GitHub

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

Jump to bottom

Add the configuration file used to setup storage to podman info #2078

Merged
merged 1 commit into from
Jan 7, 2019
Merged

Add the configuration file used to setup storage to podman info #2078

merged 1 commit into from
Jan 7, 2019

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 3, 2019

Users have no idea what storage configuration file is used to setup
storage, so adding this to podman info, should make it easier to
discover.

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S labels Jan 3, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Jan 3, 2019

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 3, 2019
mheon
mheon reviewed Jan 3, 2019
View reviewed changes
pkg/util/utils.go
// StorageConfigFile returns the path to the storage config file used
func StorageConfigFile() string {
if rootless.IsRootless() {
return filepath.Join(os.Getenv("HOME"), ".config/containers/storage.conf")
Copy link
Member

Choose a reason for hiding this comment

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

Can we make libpod use this function to decide what path to use when rootless? I don't want to have this change in one place but not the other

Copy link
Member Author

Choose a reason for hiding this comment

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

It is using this function. just above.

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S labels Jan 4, 2019
@rhatdan rhatdan changed the title [WIP] Add the configuration file used to setup storage to podman info Add the configuration file used to setup storage to podman info Jan 4, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 4, 2019
@openshift-ci-robot openshift-ci-robot added size/S and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 4, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Jan 4, 2019

@mheon @baude @giuseppe @umohnani8 @vrothberg PTAL

@vrothberg
Copy link
Member

LGTM (restarted the CI hiccups)

@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #2090) made this pull request unmergeable. Please resolve the merge conflicts.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 7, 2019
@giuseppe
Copy link
Member

giuseppe commented Jan 7, 2019

LGTM

@rhatdan
Add the configuration file used to setup storage to podman info
b367855 
Users have no idea what storage configuration file is used to setup
storage, so adding this to podman info, should make it easier to
discover.

This requires a revendor of containers/storage

Signed-off-by: Daniel J Walsh <[email protected]>
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 7, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Jan 7, 2019

@rh-atomic-bot r=giuseppe

@rh-atomic-bot
Copy link
Collaborator

📌 Commit 6ffc24c has been approved by giuseppe

@jwhonce jwhonce added this to the 1.0 milestone Jan 7, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Jan 7, 2019

@rh-atomic-bot retry

@mheon
Copy link
Member

mheon commented Jan 7, 2019

/lgtm
bot, retest this please

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2019
@rhatdan
Copy link
Member Author

rhatdan commented Jan 7, 2019

bo, retest this please

@TomSweeneyRedHat
Copy link
Member

bot, retest this please

@openshift-merge-robot openshift-merge-robot merged commit faa2462 into containers:master Jan 7, 2019
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mheon mheon mheon left review comments

@baude baude Awaiting requested review from baude

@mrunalp mrunalp Awaiting requested review from mrunalp

Assignees

@mheon mheon

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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
1.0
Development

Successfully merging this pull request may close these issues.
9 participants
@rhatdan @openshift-ci-robot @vrothberg @rh-atomic-bot @giuseppe @mheon @TomSweeneyRedHat @jwhonce @openshift-merge-robot