From 05dc1ca9e5f4a3bdff76e8d4e4d9b8b95794e6a20f6fd53898867f635fa2e4a9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Jan 2019 09:59:17 +0000 Subject: [PATCH] Accepting request 666726 from devel:kubic OBS-URL: https://build.opensuse.org/request/show/666726 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=36 --- libpod.conf | 31 ++++++++++++++++++++++++++++++- podman.changes | 13 +++++++++++++ podman.spec | 3 ++- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/libpod.conf b/libpod.conf index aaf2dab..547a213 100644 --- a/libpod.conf +++ b/libpod.conf @@ -21,7 +21,10 @@ conmon_env_vars = [ ] # CGroup Manager - valid values are "systemd" and "cgroupfs" -cgroup_manager = "cgroupfs" +cgroup_manager = "systemd" + +# Container init binary +init_path = "/usr/bin/catatonit" # Directory for persistent libpod files (database, etc) # By default, this will be configured relative to where containers/storage @@ -48,6 +51,15 @@ cni_plugin_dir = [ "/opt/cni/bin" ] +# Default CNI network for libpod. +# If multiple CNI network configs are present, libpod will use the network with +# the name given here for containers unless explicitly overridden. +# The default here is set to the name we set in the +# 87-podman-bridge.conflist included in the repository. +# Not setting this, or setting it to the empty string, will use normal CNI +# precedence rules for selecting between multiple networks. +cni_default_network = "podman" + # Default libpod namespace # If libpod is joined to a namespace, it will see only containers and pods # that were created in the same namespace, and will create new containers and @@ -55,3 +67,20 @@ cni_plugin_dir = [ # The default namespace is "", which corresponds to no namespace. When no # namespace is set, all containers and pods are visible. #namespace = "" + +## Default pause image name for pod pause containers +pause_image = "k8s.gcr.io/pause:3.1" + +# Default command to run the pause container +pause_command = "/pause" + +# Determines whether libpod will reserve ports on the host when they are +# forwarded to containers. When enabled, when ports are forwarded to containers, +# they are held open by conmon as long as the container is running, ensuring that +# they cannot be reused by other programs on the host. However, this can cause +# significant memory usage if a container has many ports forwarded to it. +# Disabling this can save memory. +#enable_port_reservation = true + +# Default libpod support for container labeling +# label=true diff --git a/podman.changes b/podman.changes index 1d1e032..2b7b342 100644 --- a/podman.changes +++ b/podman.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jan 17 11:44:58 UTC 2019 - Jordi Massaguer + +- Update requirement to go1.11 to stay in sync with CaaSP4 and use the same + version as k8s and cri-o to prevent "weird" issues because of the go version + (we had problems mixing go1.5 and go1.6 in the past) + +------------------------------------------------------------------- +Wed Jan 16 09:42:52 UTC 2019 - Richard Brown + +- Update libpod.conf to better align with upstream defaults [boo#1122024] +- Require catatonit for new --init flag + ------------------------------------------------------------------- Sun Jan 13 15:39:42 UTC 2019 - Richard Brown diff --git a/podman.spec b/podman.spec index ae74f74..7afe3f5 100644 --- a/podman.spec +++ b/podman.spec @@ -49,7 +49,7 @@ BuildRequires: libbtrfs-devel BuildRequires: libcontainers-common BuildRequires: libgpgme-devel BuildRequires: libseccomp-devel -BuildRequires: golang(API) >= 1.10 +BuildRequires: golang(API) >= 1.11 Requires: cni Requires: cni-plugins Requires: iptables @@ -58,6 +58,7 @@ Requires: libcontainers-image Requires: libcontainers-storage Requires: runc >= 1.0.0~rc4 Requires: slirp4netns +Requires: catatonit Recommends: %{name}-cni-config = %{version} %{go_nostrip} %if 0%{?with_libostree}