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

Mention no_hosts and base_hosts_file configs in CLI option docs #24122

Merged
merged 1 commit into from
Oct 4, 2024

Conversation

PhrozenByte
Copy link
Contributor

@PhrozenByte PhrozenByte commented Oct 1, 2024

Also mention the no_hosts and base_hosts_file configs of containers.conf in the docs of the --add-hosts and --no-hosts CLI options.

Follow-up to #24043
Related: containers/common#2184

Cc: @Luap99 (feel free to also ping @‎mheon and @‎edsantiago)

Does this PR introduce a user-facing change?

None

@@ -27,3 +28,8 @@ You can prevent that by either giving the **--no-hosts** option, or by setting
address was configured manually and Podman fails to determine the IP address
automatically, Podman will silently skip adding these internal hostnames to
`/etc/hosts`.

Podman will use the host's `/etc/hosts` file as a basis by default, i.e. any
hostname present in this file will also be present in the container's
Copy link
Member

Choose a reason for hiding this comment

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

nit: i think man pages generally avoid possessive apostrophes (also they do not tend to translate well). if you repush, could you reword as such (ONLY IF YOU PUSH AGAIN).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll have to push again due to the discussion in containers/common#2184. However, I'm not entirely sure what you're suggesting. You mean like "the /etc/hosts file of the host" instead of "the host's /etc/hosts file"? Because especially "the host's" and "the container's" is used all over the docs and the "of the host" appendix feels a bit cumbersome to me as non-native speaker 🙈 I'll rephrase it if that's wished though.

Copy link
Member

Choose a reason for hiding this comment

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

You mean like "the /etc/hosts file of the host" instead of "the host's /etc/hosts file"?

Correct.

@baude
Copy link
Member

baude commented Oct 1, 2024

nit, only fix if you push again ... else LGTM

@baude
Copy link
Member

baude commented Oct 2, 2024

/approve

Copy link
Contributor

openshift-ci bot commented Oct 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude, PhrozenByte

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 2, 2024
@PhrozenByte
Copy link
Contributor Author

Updated following containers/common#2184

@mheon
Copy link
Member

mheon commented Oct 4, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 17d29a2 into containers:main Oct 4, 2024
35 checks passed
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. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants