diff options
| author | Oskari Rauta <oskari.rauta@gmail.com> | 2021-11-05 00:37:54 +0200 |
|---|---|---|
| committer | Nick Hainke <vincent@systemli.org> | 2021-11-05 07:23:33 +0100 |
| commit | 3e5761d6cd3142d7d8649dbd4f14f78d43161f24 (patch) | |
| tree | 500f010a530621e7441c6d9e1f6f112fe3651ce1 /utils | |
| parent | 3873a850a5219bfb3143594843964a15860f3235 (diff) | |
podman: update to 3.4.1
A lot of changes since 3.3.1.
Full (long) lists of release notes between
versions are available at
https://github.com/containers/podman/releases
containers.conf updated
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/podman/Makefile | 6 | ||||
| -rw-r--r-- | utils/podman/files/containers.conf | 67 |
2 files changed, 61 insertions, 12 deletions
diff --git a/utils/podman/Makefile b/utils/podman/Makefile index 77f4d0875..e8323d402 100644 --- a/utils/podman/Makefile +++ b/utils/podman/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podman -PKG_VERSION:=3.3.1 +PKG_VERSION:=3.4.1 PKG_RELEASE:=$(AUTORELEASE) -PKG_HASH:=6e3c57f5fd4199bc7603effb8c34268ee7f65fcd30c7b0d4778396b69388ae1f -PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION) +PKG_HASH:=3fa70c499a4733524354518e839eefa3f14b630a519393418d082880535c1e33 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/utils/podman/files/containers.conf b/utils/podman/files/containers.conf index 3cb5e87a2..3dbaab15f 100644 --- a/utils/podman/files/containers.conf +++ b/utils/podman/files/containers.conf @@ -1,17 +1,60 @@ +#https://github.com/containers/common/blob/main/pkg/config/containers.conf + [containers] -netns="private" +#annotations = [] +#apparmor_profile = "container-default" +cgroupns = "private" +cgroups = "enabled" +netns = "private" +#pidns = "private" +#rootless_networking = "slirp4netns" +#seccomp_profile = "/usr/share/containers/seccomp.json" +#shm_size = "65536k" + +default_capabilities = [ + "CHOWN", + "DAC_OVERRIDE", + "FOWNER", + "FSETID", + "KILL", + "NET_BIND_SERVICE", + "SETFCAP", + "SETGID", + "SETPCAP", + "SETUID", + "SYS_CHROOT" +] + +default_sysctls = [ + "net.ipv4.ping_group_range=0 0", +] [network] -cni_plugin_dir="/usr/lib/cni" -network_config_dir="/etc/cni/net.d/" -default_network="podman" +cni_plugin_dirs = [ + "/usr/lib/cni" +] +network_config_dir = "/etc/cni/net.d/" +default_network = "podman" [engine] -runtime="/usr/bin/crun" -# runtime="/usr/sbin/runc" -# runtime="/sbin/uxc" -# runtime_supports_nocgroups = ["crun", "uxc"] -# runtime_supports_json = ["crun", "runc", "kata", "uxc"] +cgroup_manager = "cgroupfs" +events_logger = "none" +#image_default_transport = "docker://" +#image_parallel_copies = 0 +#infra_command = "/pause" +#infra_image = "k8s.gcr.io/pause:3.4.1" +#lock_type** = "shm" +#namespace = "" +#network_cmd_path = "" + +runtime = "crun" +# runtime = "runc" +# runtime = "uxc" + +runtime_supports_json = ["crun", "runc", "kata", "uxc"] +#runtime_supports_kvm = ["kata", "krun"] +#runtime_supports_nocgroups = ["crun", "krun", "uxc"] +#static_dir = "/var/lib/containers/storage/libpod" [engine.runtimes] crun = [ @@ -25,3 +68,9 @@ runc = [ uxc = [ "/sbin/uxc", ] + +[machine] +#cpus = 1 +#disk_size = 10 +#image = "testing" +#memory = 2048 |