Merge pull request #6196 from mheon/remote_libpod_conf

Remove libpod.conf from repo

7 files changed, 0 insertions, 199 deletions

diff --git a/Makefile b/Makefile
index e991d4b35..d4eadbb5e 100644
--- a/Makefile
+++ b/Makefile
@@ -527,11 +527,6 @@ install.man-nobuild:
 .PHONY: install.man
 install.man: docs install.man-nobuild
 
-.PHONY: install.config
-install.config:
-	install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(SHAREDIR_CONTAINERS)
-	install ${SELINUXOPT} -m 644 libpod.conf $(DESTDIR)$(SHAREDIR_CONTAINERS)/libpod.conf
-
 .PHONY: install.seccomp
 install.seccomp:
 	# TODO: we should really be using the upstream one from github.com/seccomp
diff --git a/contrib/cirrus/container_test.sh b/contrib/cirrus/container_test.sh
index 4624868f1..bf0a0d3f1 100644
--- a/contrib/cirrus/container_test.sh
+++ b/contrib/cirrus/container_test.sh
@@ -126,7 +126,6 @@ if [ $install -eq 1 ]; then
     make TAGS="${TAGS}" install.bin PREFIX=/usr ETCDIR=/etc
     make TAGS="${TAGS}" install.man PREFIX=/usr ETCDIR=/etc
     make TAGS="${TAGS}" install.cni PREFIX=/usr ETCDIR=/etc
-    make TAGS="${TAGS}" install.config PREFIX=/usr ETCDIR=/etc
     make TAGS="${TAGS}" install.systemd PREFIX=/usr ETCDIR=/etc
 fi
 
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index 6341bcb4a..0f2b2ab7e 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -50,7 +50,6 @@ case "$SPECIALMODE" in
     none)
         make
         make install PREFIX=/usr ETCDIR=/etc
-        make install.config PREFIX=/usr
         make test-binaries
         if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
         then
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 750aec3b6..c0dd8cfc5 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -98,7 +98,6 @@ ROOTLESS_ENV_RE='(CIRRUS_.+)|(ROOTLESS_.+)|(.+_IMAGE.*)|(.+_BASE)|(.*DIRPATH)|(.
 SECRET_ENV_RE='(IRCID)|(ACCOUNT)|(GC[EP]..+)|(SSH)'
 
 SPECIALMODE="${SPECIALMODE:-none}"
-MOD_LIBPOD_CONF="${MOD_LIBPOD_CONF:false}"
 TEST_REMOTE_CLIENT="${TEST_REMOTE_CLIENT:-false}"
 export CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-podman}
 
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 756240444..945b33909 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -76,12 +76,6 @@ case "$CG_FS_TYPE" in
         X=$(echo "export OCI_RUNTIME=/usr/bin/crun" | \
             tee -a /etc/environment) && eval "$X" && echo "$X"
 
-        if [[ "$MOD_LIBPOD_CONF" == "true" ]]; then
-            warn "Updating runtime setting in repo. copy of libpod.conf"
-            sed -i -r -e 's/^runtime = "runc"/runtime = "crun"/' $GOSRC/libpod.conf
-            git diff $GOSRC/libpod.conf
-        fi
-
         if [[ "$OS_RELEASE_ID" == "fedora" ]]; then
             warn "Upgrading to the latest crun"
             # Normally not something to do for stable testing
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 1dfbdf208..ff948701b 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -423,10 +423,6 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{build
 
 mv pkg/hooks/README.md pkg/hooks/README-hooks.md
 
-# install libpod.conf
-install -dp %{buildroot}%{_datadir}/containers
-install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers
-
 # install conmon
 install -dp %{buildroot}%{_libexecdir}/%{name}
 install -p -m 755 conmon/bin/conmon %{buildroot}%{_libexecdir}/%{name}
diff --git a/libpod.conf b/libpod.conf
deleted file mode 100644
index 1bc31eb4c..000000000
--- a/libpod.conf
+++ /dev/null
@@ -1,181 +0,0 @@
-# libpod.conf is the default configuration file for all tools using libpod to
-# manage containers
-
-# Default transport method for pulling and pushing for images
-image_default_transport = "docker://"
-
-# Paths to look for the conmon container manager binary.
-# If the paths are empty or no valid path was found, then the `$PATH`
-# environment variable will be used as the fallback.
-conmon_path = [
-	    "/usr/libexec/podman/conmon",
-	    "/usr/local/libexec/podman/conmon",
-	    "/usr/local/lib/podman/conmon",
-	    "/usr/bin/conmon",
-	    "/usr/sbin/conmon",
-	    "/usr/local/bin/conmon",
-	    "/usr/local/sbin/conmon",
-	    "/run/current-system/sw/bin/conmon",
-]
-
-# Environment variables to pass into conmon
-conmon_env_vars = [
-		"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-]
-
-# CGroup Manager - valid values are "systemd" and "cgroupfs"
-cgroup_manager = "systemd"
-
-# Container init binary
-#init_path = "/usr/libexec/podman/catatonit"
-
-# Directory for persistent libpod files (database, etc)
-# By default, this will be configured relative to where containers/storage
-# stores containers
-# Uncomment to change location from this default
-#static_dir = "/var/lib/containers/storage/libpod"
-
-# Directory for temporary files. Must be tmpfs (wiped after reboot)
-tmp_dir = "/var/run/libpod"
-
-# Maximum size of log files (in bytes)
-# -1 is unlimited
-max_log_size = -1
-
-# Whether to use chroot instead of pivot_root in the runtime
-no_pivot_root = false
-
-# Directory containing CNI plugin configuration files
-cni_config_dir = "/etc/cni/net.d/"
-
-# Directories where the CNI plugin binaries may be located
-cni_plugin_dir = [
-	       "/usr/libexec/cni",
-	       "/usr/lib/cni",
-	       "/usr/local/lib/cni",
-	       "/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
-# pods in that namespace.
-# The default namespace is "", which corresponds to no namespace. When no
-# namespace is set, all containers and pods are visible.
-#namespace = ""
-
-# Default infra (pause) image name for pod infra containers
-infra_image = "k8s.gcr.io/pause:3.2"
-
-# Default command to run the infra container
-infra_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
-
-# The locking mechanism to use
-lock_type = "shm"
-
-# Number of locks available for containers and pods.
-# If this is changed, a lock renumber must be performed (e.g. with the
-# 'podman system renumber' command).
-num_locks = 2048
-
-# Directory for libpod named volumes.
-# By default, this will be configured relative to where containers/storage
-# stores containers.
-# Uncomment to change location from this default.
-#volume_path = "/var/lib/containers/storage/volumes"
-
-# Selects which logging mechanism to use for Podman events.  Valid values
-# are `journald` or `file`.
-# events_logger = "journald"
-
-# Specify the keys sequence used to detach a container.
-# Format is a single character [a-Z] or a comma separated sequence of
-# `ctrl-<value>`, where `<value>` is one of:
-# `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_`
-#
-# detach_keys = "ctrl-p,ctrl-q"
-
-# Default OCI runtime
-runtime = "runc"
-
-# List of the OCI runtimes that support --format=json.  When json is supported
-# libpod will use it for reporting nicer errors.
-runtime_supports_json = ["crun", "runc"]
-
-# List of all the OCI runtimes that support --cgroup-manager=disable to disable
-# creation of CGroups for containers.
-runtime_supports_nocgroups = ["crun"]
-
-# Paths to look for a valid OCI runtime (runc, runv, etc)
-# If the paths are empty or no valid path was found, then the `$PATH`
-# environment variable will be used as the fallback.
-[runtimes]
-runc = [
-	    "/usr/bin/runc",
-	    "/usr/sbin/runc",
-	    "/usr/local/bin/runc",
-	    "/usr/local/sbin/runc",
-	    "/sbin/runc",
-	    "/bin/runc",
-	    "/usr/lib/cri-o-runc/sbin/runc",
-	    "/run/current-system/sw/bin/runc",
-]
-
-crun = [
-		"/usr/bin/crun",
-		"/usr/sbin/crun",
-		"/usr/local/bin/crun",
-		"/usr/local/sbin/crun",
-		"/sbin/crun",
-		"/bin/crun",
-		"/run/current-system/sw/bin/crun",
-]
-
-# Kata Containers is an OCI runtime, where containers are run inside lightweight
-# Virtual Machines (VMs). Kata provides additional isolation towards the host,
-# minimizing the host attack surface and mitigating the consequences of
-# containers breakout.
-# Please notes that Kata does not support rootless podman yet, but we can leave
-# the paths below blank to let them be discovered by the $PATH environment
-# variable.
-
-# Kata Containers with the default configured VMM
-kata-runtime = [
-    "/usr/bin/kata-runtime",
-]
-
-# Kata Containers with the QEMU VMM
-kata-qemu = [
-    "/usr/bin/kata-qemu",
-]
-
-# Kata Containers with the Firecracker VMM
-kata-fc = [
-    "/usr/bin/kata-fc",
-]
-
-# The [runtimes] table MUST be the last thing in this file.
-# (Unless another table is added)
-# TOML does not provide a way to end a table other than a further table being
-# defined, so every key hereafter will be part of [runtimes] and not the main
-# config.