Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

podman: ship storage.conf and use runc by default for now

Browse source 
Ship podman with defaults more coherent with user expectations and
more likely to work out-of-the-box.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-11-19 17:58:12 +00:00
parent 78dd3e05a8
commit 75cb9949b7
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
utils/podman/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=podman
PKG_VERSION:=2.1.1
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
@ -61,6 +61,7 @@ define Package/podman/install
$(INSTALL_DIR) $(1)/etc/containers
$(INSTALL_CONF) $(DL_DIR)/default-policy.json-362f70b056 $(1)/etc/containers/policy.json
$(INSTALL_CONF) $(DL_DIR)/registries.fedora-da9a9c8778 $(1)/etc/containers/registries.conf
$(INSTALL_CONF) $(PKG_BUILD_DIR)/vendor/github.com/containers/storage/storage.conf $(1)/etc/containers/storage.conf
$(INSTALL_CONF) ./files/containers.conf $(1)/etc/containers/containers.conf
$(INSTALL_DIR) $(1)/etc/cni/net.d
$(INSTALL_CONF) $(PKG_BUILD_DIR)/cni/87-podman-bridge.conflist $(1)/etc/cni/net.d/

13
utils/podman/files/containers.conf
View file

@ -7,4 +7,15 @@ network_config_dir="/etc/cni/net.d/"
default_network="podman"
[engine]
runtime="/sbin/uxc"
# runtime="/sbin/uxc"
# runtime_supports_nocgroups = ["crun", "uxc"]
# runtime_supports_json = ["crun", "runc", "kata", "uxc"]
[engine.runtimes]
runc = [
"/usr/sbin/runc",
]
uxc = [
"/sbin/uxc",
]