diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE.md | 3 | ||||
| -rw-r--r-- | docs/source/conf.py | 26 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 3 | ||||
| -rw-r--r-- | troubleshooting.md | 10 |
4 files changed, 39 insertions, 3 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1a7153848..b8ba48819 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -67,7 +67,8 @@ Briefly describe the problem you are having in a few paragraphs. (paste your output here) ``` -**Have you tested with the latest version of Podman and have you checked the Podman Troubleshooting Guide?** +**Have you tested with the latest version of Podman and have you checked the Podman Troubleshooting Guide? (https://github.com/containers/podman/blob/master/troubleshooting.md)** + Yes/No diff --git a/docs/source/conf.py b/docs/source/conf.py index 883e1240e..52869baf4 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -14,6 +14,8 @@ # import sys # sys.path.insert(0, os.path.abspath('.')) +import re +from recommonmark.transform import AutoStructify # -- Project information ----------------------------------------------------- @@ -59,3 +61,27 @@ html_css_files = [ ] # -- Extension configuration ------------------------------------------------- + +def convert_markdown_title(app, docname, source): + # Process markdown files only + docpath = app.env.doc2path(docname) + if docpath.endswith(".md"): + # Convert pandoc title line into eval_rst block for recommonmark + source[0] = re.sub( + r"^% (.*)", + r"```eval_rst\n.. title:: \g<1>\n```", + source[0]) + + +def setup(app): + app.connect("source-read", convert_markdown_title) + + app.add_config_value( + "recommonmark_config", { + "enable_eval_rst": True, + "enable_auto_doc_ref": False, + "enable_auto_toc_tree": False, + "enable_math": False, + "enable_inline_math": False, + }, True) + app.add_transform(AutoStructify) diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 9f8791e5d..788dc4cd1 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -141,7 +141,7 @@ load helpers is "$output" ".* inet ${mysubnet}\.2/24 brd ${mysubnet}\.255 " \ "sdfsdf" - run_podman run --rm -d --network $mynetname -p 127.0.0.1:$myport:$myport \ + run_podman run -d --network $mynetname -p 127.0.0.1:$myport:$myport \ $IMAGE nc -l -n -v -p $myport cid="$output" @@ -167,6 +167,7 @@ load helpers is "$output" "Error: the network name $mynetname is already used" \ "Trying to create an already-existing network" + run_podman rm $cid run_podman network rm $mynetname run_podman 1 network rm $mynetname } diff --git a/troubleshooting.md b/troubleshooting.md index c5c592a8e..1e21edab4 100644 --- a/troubleshooting.md +++ b/troubleshooting.md @@ -23,7 +23,7 @@ touch: cannot touch '/content/file': Permission denied #### Solution -This is usually caused by SELinux. +This is sometimes caused by SELinux, and sometimes by user namespaces. Labeling systems like SELinux require that proper labels are placed on volume content mounted into a container. Without a label, the security system might @@ -47,6 +47,14 @@ will disable SELinux separation for the container. $ podman run --security-opt label=disable -v ~:/home/user fedora touch /home/user/file +In cases where the container image runs as a specific, non-root user, though, the +solution is to fix the user namespace. This would include container images such as +the Jupyter Notebook image (which runs as "jovyan") and the Postgres image (which runs +as "postgres"). In either case, use the `--userns` switch to map user namespaces, +most of the time by using keep_id option. + +$ podman run -v "$PWD":/home/jovyan/work --userns=keep_id jupyter/scipy-notebook + --- ### 3) No such image or Bare keys cannot contain ':' |