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

Improve Podman provider #298

Closed
wants to merge 6 commits into from
Closed

Improve Podman provider #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1717b8
feat: podman: handle custom network configuration
abbra Oct 8, 2024
9571556
fix: podman: use proper seccomp configuration
abbra Oct 8, 2024
38586fd
fix: podman: update provisioning config
abbra Oct 8, 2024
349401b
fix: setup: package seccomp filter
abbra Oct 8, 2024
ab97a72
fix: podman: set podman connection information for ansible
abbra Oct 8, 2024
dde2f2f
fix: reformat by black
abbra Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['m2r2']
extensions = ["m2r2"]

# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]
Expand All @@ -54,4 +54,4 @@
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = []
source_suffix = ['.rst', '.md']
source_suffix = [".rst", ".md"]
5 changes: 4 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

MRACK_CONF = "mrack.conf"
PROV_CONF = "provisioning-config.yaml"
SECCOMP_JSON = "seccomp.json"

setup(
name="mrack",
Expand All @@ -52,7 +53,9 @@
install_requires=reqs,
scripts=["scripts/mrack"],
package_data={
"mrack": [f"data/{datafile}" for datafile in [MRACK_CONF, PROV_CONF]]
"mrack": [
f"data/{datafile}" for datafile in [MRACK_CONF, PROV_CONF, SECCOMP_JSON]
]
},
extras_require={
"krb-owner": ["gssapi"],
Expand Down
15 changes: 4 additions & 11 deletions src/mrack/data/provisioning-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ podman:
# this will be used as prefix for the network name
default_network: mrack

network_options:
- "--ipv6"

# advanced podman options to be passed to every execution of podman run eg:
# NOTE: when 'key' in podman_options has list assigned as value
# the option specidfied by the 'key' is added multiple times
Expand All @@ -21,17 +24,7 @@ podman:
"--cap-add":
- "ALL"
# Allowed syscall list seccomp JSON file to be used as a seccomp filter
"--security-opt": "seccomp=src/mrack/data/seccomp.json"
# Mount a temporary filesystems (tmpfs) into a container
"--tmpfs":
- "/tmp"
- "/run"
- "/run/lock"
# Use /sys/fs/cgroup in container as read only volume
"-v":
- "/sys/fs/cgroup:/sys/fs/cgroup:ro"
# Adding ipv6 support to network
"--network": "enable_ipv6=true"
Comment on lines -24 to -34
Copy link
Member

Choose a reason for hiding this comment

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

This file is just a means for documentation and serves as an example. It doesn't affect execution. I would probably only remove the last line

"--security-opt": "seccomp=/etc/mrack/seccomp.json"

virt:
images:
Expand Down
Loading
Loading