update configuration for rootless podman #6954

gatoniel · 2020-07-13T16:51:04Z

I updated the configuration part of the tutorial on rootless podman. I added the order in which configuration files are read in and a hint, how users can create default configuration in the home directories.

Closes #6777

Signed-off-by: Niklas Netter [email protected]

mheon · 2020-07-13T17:01:56Z

docs/tutorials/rootless_tutorial.md

@@ -106,8 +106,31 @@ Once the Administrator has completed the setup on the machine and then the confi

 ### User Configuration Files

-The Podman configuration files for root reside in `/usr/share/containers` with overrides in `/etc/containers`.  In the rootless environment they reside in `${XDG_CONFIG_HOME}/containers` (usually `~/.config/containers`) and are owned by each individual user.  The main files are `libpod.conf` and `storage.conf` and the user can modify these files as they wish.
+The three main configuration files are `containers.conf`, `storage.conf` and `registries.conf`.
+#### containers.conf


Can you add an extra blank line before this header?

mheon · 2020-07-13T17:02:22Z

docs/tutorials/rootless_tutorial.md

+2. `/etc/containers/registries.d/*`
+3. `HOME/.config/containers/registries.conf`
+
+The files in the home directory should be used to configure rootless podman for personal needs. These files do not exist by default. Users can copy the files from `/usr/share/containers` or `/etc/containers` and modify them.


Suggest rephrasing: "do not exist by default" -> "are not created by default"

mheon · 2020-07-13T17:02:30Z

/approve

openshift-ci-robot · 2020-07-13T17:02:33Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gatoniel, mheon

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~~ [mheon]

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

mheon · 2020-07-13T17:03:27Z

Thanks for the contribution! Your commit appears to be missing a signoff - can you run git commit -s --amend --no-edit to add one and re-push?

gatoniel · 2020-07-14T07:48:40Z

Sorry for the mess. There should now be a signoff.

TomSweeneyRedHat · 2020-07-14T21:22:30Z

docs/tutorials/rootless_tutorial.md

+2. `/etc/containers/registries.d/*`
+3. `HOME/.config/containers/registries.conf`
+
+The files in the home directory should be used to configure rootless podman for personal needs. These files are not created by default. Users can copy the files from `/usr/share/containers` or `/etc/containers` and modify them.


I thought some of these files were created by default for a rootless user in their home directory?

Not any longer.

Perhaps we should create the directories. The problem with creating the files, is we ended up hard coding some defaults that we later changed, and users ended up with bad files in their homedirs, which we could not change.

rhatdan · 2020-07-15T10:07:23Z

@gatoniel You need to rebase and squash your commits as well as sign them

git rebase -i origin
git commit -a --amend -s
git push --force

rhatdan · 2020-07-15T10:10:56Z

docs/tutorials/rootless_tutorial.md

+1. `/etc/containers/storage.conf`
+2. `$HOME/.config/containers/storage.conf`
+
+In rootless podman certain fields in `/etc/containers/storage.conf` are ignored.


We should list the fields that are ignored.

graphroot="" container storage graph dir (default: "/var/lib/containers/storage") Default directory to store all writable content created by container storage programs. runroot="" container storage run dir (default: "/var/run/containers/storage") Default directory to store all temporary writable content created by container storage programs.

I suggest adding their default values, when in rootless podman. (see new commits). I do not exactly know, if podman really reads out $XDG_RUNTIME_DIR or just defaults to /run/user/$UID.

It uses XDG_RUNTIME_DIR

rhatdan · 2020-07-15T10:12:47Z

BTW @gatoniel Nice work.

rhatdan · 2020-07-16T11:23:52Z

You really need to squash your commits and sign the one commit, to get it past the gating test.

rhatdan · 2020-07-23T09:07:46Z

@gatoniel still working on this? Needs a rebase and to squash your commits.

gatoniel · 2020-07-23T16:45:55Z

@gatoniel still working on this? Needs a rebase and to squash your commits.

I am so sorry for taking your time. I have never used the rebase before. Now I swapped pick -> squash . I hope that´s correct.

How can I resolve the build_each_commit fail?

rhatdan · 2020-07-23T17:29:02Z

Sadly still needs a rebase.

rhatdan · 2020-07-24T14:15:34Z

@gatoniel Sadly one more rebase.

I updated the configuration part of the tutorial on rootless podman. I added the order in which configuration files are read in and a hint, how users can create default configuration in the home directories. Closes containers#6777 Signed-off-by: Niklas Netter <[email protected]>

gatoniel · 2020-07-24T15:50:50Z

I do not think this is a rebase issue. There is always an auto-merging conflict.

I now resolved the auto-merging conflict by using Githubs PR resolver, this added the new commit. The tide test is now pending instead of failing. But build_each_commit is still failing with this error message

source $SCRIPT_BASE/lib.sh &> /dev/null
git fetch --depth 50 origin $DEST_BRANCH |& ${TIMESTAMP}
[11:38:38] START - All [+xxxx] lines that follow are relative to right now.
[+0003s] From https://github.com/containers/podman
[+0003s] * branch master -> FETCH_HEAD
[+0003s] * [new branch] master -> origin/master
[11:38:41] END - [+0003s] total duration since START
make build-all-new-commits GIT_BASE_BRANCH=origin/$DEST_BRANCH |& ${TIMESTAMP}
[11:38:41] START - All [+xxxx] lines that follow are relative to right now.
[+0004s] # Validate that all the commits build on top of origin/master
[+0004s] git rebase origin/master -x make
[+0006s] Rebasing (1/2)
error: could not apply c35c453... update configuration for rootless podman
[+0006s] Resolve all conflicts manually, mark them as resolved with
[+0006s] "git add/rm <conflicted_files>", then run "git rebase --continue".
[+0006s] You can instead skip this commit: run "git rebase --skip".
[+0006s] To abort and get back to the state before "git rebase", run "git rebase --abort".
[+0006s] Could not apply c35c453... update configuration for rootless podman
[+0006s] Auto-merging docs/tutorials/rootless_tutorial.md
[+0006s] CONFLICT (content): Merge conflict in docs/tutorials/rootless_tutorial.md
[+0006s] Adding contrib/systemd/user
[+0006s] make: *** [Makefile:695: build-all-new-commits] Error 1
[11:38:47] END - [+0006s] total duration since START

Exit status: 2

I really do not know what to do.

rhatdan · 2020-07-24T16:06:15Z

@gatoniel I took this over to complete it #7079
Thanks, I will get it merged.

openshift-ci-robot requested review from giuseppe and jwhonce July 13, 2020 16:51

mheon reviewed Jul 13, 2020

View reviewed changes

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

TomSweeneyRedHat reviewed Jul 14, 2020

View reviewed changes

rhatdan reviewed Jul 15, 2020

View reviewed changes

gatoniel force-pushed the master branch 2 times, most recently from 7cc4f87 to 6211a5a Compare July 16, 2020 11:47

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

gatoniel force-pushed the master branch from 6211a5a to b2d6b40 Compare July 23, 2020 16:20

gatoniel force-pushed the master branch from b2d6b40 to 18c4dce Compare July 24, 2020 15:04

gatoniel force-pushed the master branch from 18c4dce to c35c453 Compare July 24, 2020 15:23

Merge branch 'master' into master

c394ee3

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

rhatdan mentioned this pull request Jul 24, 2020

update configuration for rootless podman #7079

Merged

rhatdan closed this Jul 24, 2020

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

update configuration for rootless podman #6954

update configuration for rootless podman #6954

gatoniel commented Jul 13, 2020

mheon Jul 13, 2020

mheon Jul 13, 2020

mheon commented Jul 13, 2020

openshift-ci-robot commented Jul 13, 2020

mheon commented Jul 13, 2020

gatoniel commented Jul 14, 2020

TomSweeneyRedHat Jul 14, 2020

rhatdan Jul 15, 2020

rhatdan Jul 15, 2020

rhatdan commented Jul 15, 2020

rhatdan Jul 15, 2020

gatoniel Jul 16, 2020

rhatdan Jul 16, 2020

rhatdan commented Jul 15, 2020

rhatdan commented Jul 16, 2020

rhatdan commented Jul 23, 2020

gatoniel commented Jul 23, 2020

rhatdan commented Jul 23, 2020

rhatdan commented Jul 24, 2020

gatoniel commented Jul 24, 2020

rhatdan commented Jul 24, 2020

update configuration for rootless podman #6954

update configuration for rootless podman #6954

Conversation

gatoniel commented Jul 13, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mheon commented Jul 13, 2020

openshift-ci-robot commented Jul 13, 2020

mheon commented Jul 13, 2020

gatoniel commented Jul 14, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhatdan commented Jul 15, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhatdan commented Jul 15, 2020

rhatdan commented Jul 16, 2020

rhatdan commented Jul 23, 2020

gatoniel commented Jul 23, 2020

rhatdan commented Jul 23, 2020

rhatdan commented Jul 24, 2020

gatoniel commented Jul 24, 2020

rhatdan commented Jul 24, 2020