Switch references from libpod.conf to containers.conf #7009

rhatdan · 2020-07-17T20:52:17Z

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

openshift-ci-robot · 2020-07-17T20:52:25Z

[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:

~~OWNERS~~ [rhatdan]

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

rhatdan · 2020-07-17T20:52:32Z

Should help with #6982

TomSweeneyRedHat · 2020-07-17T21:50:36Z

tests are falling down @rhatdan

TomSweeneyRedHat · 2020-07-17T21:52:18Z

docs/source/markdown/podman.1.md


-    libpod.conf is the configuration file for all tools using libpod to manage containers, when run as root.  Administrators can override the defaults file by creating `/etc/containers/libpod.conf`.  When Podman runs in rootless mode, the file `$HOME/.config/containers/libpod.conf` is created and replaces some fields in the system configuration file.
+    containers.conf is the configuration file for container engines.  Administrators can override the defaults file by creating `/etc/containers/containers.conf`.  When Podman runs in rootless mode, the file `$HOME/.config/containers/containers.conf` is created and replaces some fields in the system configuration file.


Suggested change

containers.conf is the configuration file for container engines. Administrators can override the defaults file by creating `/etc/containers/containers.conf`. When Podman runs in rootless mode, the file `$HOME/.config/containers/containers.conf` is created and replaces some fields in the system configuration file.

containers.conf is the configuration file for container engines, when run as root. Administrators can override the defaults file by creating `/etc/containers/containers.conf`. When Podman runs in rootless mode, the file `$HOME/.config/containers/containers.conf` is created and replaces some fields in the system configuration file.

@TomSweeneyRedHat How about the new wording.

TomSweeneyRedHat · 2020-07-18T15:21:26Z

docs/source/markdown/podman-attach.1.md

@@ -15,7 +15,7 @@ or name, either to view its ongoing output or to control it interactively.
 You can detach from the container (and leave it running) using a configurable key sequence. The default
 sequence is `ctrl-p,ctrl-q`.
 Configure the keys sequence using the **--detach-keys** option, or specifying
-it in the **libpod.conf** file: see **libpod.conf(5)** for more information.
+it in the **containers.conf** file: see **containers.conf(5)** for more information.


Probably should add container.conf(5) to the bottom of this page.

TomSweeneyRedHat · 2020-07-18T15:22:00Z

docs/source/markdown/podman-events.1.md

@@ -10,7 +10,7 @@ podman\-events - Monitor Podman events

 Monitor and print events that occur in Podman. Each event will include a timestamp,
 a type, a status, name (if applicable), and image (if applicable).  The default logging
-mechanism is *journald*. This can be changed in libpod.conf by changing the `events_logger`
+mechanism is *journald*. This can be changed in containers.conf by changing the `events_logger`


Probably should add container.conf(5) to the bottom of this page.

TomSweeneyRedHat · 2020-07-18T15:23:37Z

docs/source/markdown/podman.1.md

@@ -23,7 +23,7 @@ created by the other.

 **--cgroup-manager**=*manager*

-CGroup manager to use for container cgroups. Supported values are cgroupfs or systemd. Default is systemd unless overridden in the libpod.conf file.
+CGroup manager to use for container cgroups. Supported values are cgroupfs or systemd. Default is systemd unless overridden in the containers.conf file.


Suggested change

CGroup manager to use for container cgroups. Supported values are cgroupfs or systemd. Default is systemd unless overridden in the containers.conf file.

The cgroup manager to use for container cgroups. Supported values are cgroupfs or systemd. Default is systemd unless overridden in the containers.conf file.

TomSweeneyRedHat · 2020-07-18T15:25:02Z

docs/source/markdown/podman.1.md

-    Podman uses builtin defaults if no libpod.conf file is found.
+Distributions ship the `/usr/share/containers/containers.conf` file with their defaults. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file.  Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges it's builtin defaults with the specify fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution files, which override the builtin defaults.
+
+    Podman uses builtin defaults if no containers.conf file is found.


space/tab issue on this line?

docs/source/markdown/podman.1.md

rhatdan · 2020-07-20T11:00:42Z

@TomSweeneyRedHat PTAL again.

csomh · 2020-07-20T13:25:36Z

The following podman man-pages still contain references to libpod.conf without mentioning containers.conf. If the intent is to replace libpod.conf with containers.conf, then probably these should be also updated:

$ git grep -le 'libpod\.conf' docs/source/markdown/podman-*
docs/source/markdown/podman-attach.1.md
docs/source/markdown/podman-create.1.md
docs/source/markdown/podman-events.1.md
docs/source/markdown/podman-run.1.md
docs/source/markdown/podman-system-migrate.1.md
docs/source/markdown/podman-system-renumber.1.md

Furthermore there is a mention of libpod.conf in docs/tutorials/rootless_tutorial.md, too.

TomSweeneyRedHat · 2020-07-20T14:36:50Z

docs/source/markdown/podman.1.md


-    Podman uses builtin defaults if no libpod.conf file is found.
+Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file.  Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges it's builtin defaults with the specify fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.


It's and its drives me crazy, need to remove an apostrophe.

Suggested change

Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges it's builtin defaults with the specify fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.

Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges its builtin defaults with the specify fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.

Suggested change

Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges it's builtin defaults with the specify fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.

Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges it's builtin defaults with the specified fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.

specify to specified in the prior, doesn't show well in the diff

rhatdan · 2020-07-20T18:24:13Z

@csomh I think I got them all.

TomSweeneyRedHat · 2020-07-20T18:33:00Z

docs/source/markdown/podman.1.md


-    Podman uses builtin defaults if no libpod.conf file is found.
+Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file.  Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges its builtin defaults with the specified fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.


sorry if I missed this this morning, missing a possesive adminstrator.

Suggested change

Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges its builtin defaults with the specified fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.

Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges its builtin defaults with the specified fields from these files, if they exist. Fields specified in the users file override the administrator's file, which overrides the distribution's file, which override the built-in defaults.

TomSweeneyRedHat

one stinking apostrophe, otherwise LGTM

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

rhatdan · 2020-07-20T19:10:50Z

@mheon @csomh @QiWang19 @vrothberg @baude @jwhonce @ashley-cui PTAL

QiWang19 · 2020-07-20T21:30:57Z

LGTM. @TomSweeneyRedHat PTAL

csomh

LGTM, thank you!

vrothberg

/lgtm

Jobs unable to start because podman trying to use systemd cgroup manager. See error below : ``` WARN[0000] Failed to add conmon to systemd sandbox cgroup: dial unix /run/systemd/private: connect: no such file or directory Error: OCI runtime error: systemd cgroup flag passed, but systemd support for managing cgroups is not available ``` * According to this PR containers/podman#7009, podman switch references from libpod.conf to containers.conf. * According to containers.conf man (https://github.com/containers/common/blob/main/docs/containers.conf.5.md), configuration file is a TOML file but engine section declaration is missing.

@Siorde

Update Dockerfile.j2 SUMMARY Jobs unable to start because podman trying to use systemd cgroup manager. See error below : WARN[0000] Failed to add conmon to systemd sandbox cgroup: dial unix /run/systemd/private: connect: no such file or directory Error: OCI runtime error: systemd cgroup flag passed, but systemd support for managing cgroups is not available related #10099 ISSUE TYPE Bugfix Pull Request COMPONENT NAME API AWX VERSION awx: 19.0.0 ADDITIONAL INFORMATION According to this PR containers/podman#7009, podman switch references from libpod.conf to containers.conf. According to containers.conf man (https://github.com/containers/common/blob/main/docs/containers.conf.5.md), configuration file is a TOML file but engine section declaration is missing. thanks to @Siorde too 👍 Reviewed-by: Chris Meyers <None> Reviewed-by: Shane McDonald <me@shanemcd.com>

openshift-ci-robot requested review from jwhonce and TomSweeneyRedHat July 17, 2020 20:52

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 17, 2020

rhatdan mentioned this pull request Jul 17, 2020

RUN fails in rootless podman build when cgroups is v1 #6982

Closed

rhatdan added Backport to v2.0 and removed Needed for V2 labels Jul 17, 2020

TomSweeneyRedHat reviewed Jul 17, 2020

View reviewed changes

rhatdan force-pushed the containers.conf branch from ee07c23 to 9b76b5a Compare July 18, 2020 10:07

TomSweeneyRedHat reviewed Jul 18, 2020

View reviewed changes

docs/source/markdown/podman.1.md Outdated Show resolved Hide resolved

rhatdan force-pushed the containers.conf branch from 5b0c43b to dbed8d3 Compare July 19, 2020 11:31

TomSweeneyRedHat reviewed Jul 20, 2020

View reviewed changes

rhatdan force-pushed the containers.conf branch from dbed8d3 to 144b86a Compare July 20, 2020 18:14

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2020

rhatdan force-pushed the containers.conf branch from 144b86a to 2e24a34 Compare July 20, 2020 18:17

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2020

rhatdan force-pushed the containers.conf branch from 2e24a34 to 4b7308a Compare July 20, 2020 18:23

TomSweeneyRedHat reviewed Jul 20, 2020

View reviewed changes

Switch references from libpod.conf to containers.conf

841eac0

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

rhatdan force-pushed the containers.conf branch from 4b7308a to 841eac0 Compare July 20, 2020 19:10

csomh reviewed Jul 21, 2020

View reviewed changes

vrothberg reviewed Jul 21, 2020

View reviewed changes

openshift-ci-robot assigned vrothberg Jul 21, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 21, 2020

openshift-merge-robot merged commit df6920a into containers:master Jul 21, 2020

mayasd mentioned this pull request Jun 16, 2021

Update Dockerfile.j2 ansible/awx#10463

Merged

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 24, 2023

github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch references from libpod.conf to containers.conf #7009

Switch references from libpod.conf to containers.conf #7009

rhatdan commented Jul 17, 2020

openshift-ci-robot commented Jul 17, 2020

rhatdan commented Jul 17, 2020

TomSweeneyRedHat commented Jul 17, 2020

TomSweeneyRedHat Jul 17, 2020

rhatdan Jul 18, 2020

TomSweeneyRedHat Jul 18, 2020

rhatdan Jul 19, 2020

TomSweeneyRedHat Jul 18, 2020

rhatdan Jul 19, 2020

TomSweeneyRedHat Jul 18, 2020

TomSweeneyRedHat Jul 18, 2020

rhatdan Jul 19, 2020

rhatdan commented Jul 20, 2020

csomh commented Jul 20, 2020

TomSweeneyRedHat Jul 20, 2020

TomSweeneyRedHat Jul 20, 2020

TomSweeneyRedHat Jul 20, 2020

rhatdan Jul 20, 2020

rhatdan commented Jul 20, 2020

TomSweeneyRedHat Jul 20, 2020

TomSweeneyRedHat left a comment

rhatdan commented Jul 20, 2020

QiWang19 commented Jul 20, 2020

csomh left a comment

vrothberg left a comment


		libpod.conf is the configuration file for all tools using libpod to manage containers, when run as root. Administrators can override the defaults file by creating `/etc/containers/libpod.conf`. When Podman runs in rootless mode, the file `$HOME/.config/containers/libpod.conf` is created and replaces some fields in the system configuration file.
		containers.conf is the configuration file for container engines. Administrators can override the defaults file by creating `/etc/containers/containers.conf`. When Podman runs in rootless mode, the file `$HOME/.config/containers/containers.conf` is created and replaces some fields in the system configuration file.

	CGroup manager to use for container cgroups. Supported values are cgroupfs or systemd. Default is systemd unless overridden in the containers.conf file.
	The cgroup manager to use for container cgroups. Supported values are cgroupfs or systemd. Default is systemd unless overridden in the containers.conf file.


		Podman uses builtin defaults if no libpod.conf file is found.
		Distributions ship the `/usr/share/containers/containers.conf` file with their default settings. Administrators can override fields in this file by creating the `/etc/containers/containers.conf` file. Users can further modify defaults by creating the `$HOME/.config/containers/containers.conf` file. Podman merges it's builtin defaults with the specify fields from these files, if they exist. Fields specified in the users file override the administrators file, which overrides the distribution's file, which override the built-in defaults.

Switch references from libpod.conf to containers.conf #7009

Switch references from libpod.conf to containers.conf #7009

Conversation

rhatdan commented Jul 17, 2020

openshift-ci-robot commented Jul 17, 2020

rhatdan commented Jul 17, 2020

TomSweeneyRedHat commented Jul 17, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhatdan commented Jul 20, 2020

csomh commented Jul 20, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhatdan commented Jul 20, 2020

Choose a reason for hiding this comment

TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

rhatdan commented Jul 20, 2020

QiWang19 commented Jul 20, 2020

csomh left a comment

Choose a reason for hiding this comment

vrothberg left a comment

Choose a reason for hiding this comment