diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-04-13 06:12:11 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-04-18 10:59:39 -0400 |
| commit | 615a9e9f78eee0038b8803eb1223541fe28c6e16 (patch) | |
| tree | 9f38158e62858fbead53817418a7150567dd17ec /libpod | |
| parent | 4d45f5180f778bf3a298bf061ca2c0dba0d4bfad (diff) | |
| download | podman-615a9e9f78eee0038b8803eb1223541fe28c6e16.tar.gz podman-615a9e9f78eee0038b8803eb1223541fe28c6e16.tar.bz2 podman-615a9e9f78eee0038b8803eb1223541fe28c6e16.zip | |
Internal names do not match external names
We refer to the pause_image and pause_container in the libpod.conf
description, but internally we had infra_image and infra_container.
This means it the user made changes to the conf, it would not effect the
actual tool using libpod.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/testdata/config.toml | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/libpod/testdata/config.toml b/libpod/testdata/config.toml deleted file mode 100644 index 1d78f2083..000000000 --- a/libpod/testdata/config.toml +++ /dev/null @@ -1,28 +0,0 @@ -[crio] - root = "/var/lib/containers/storage" - runroot = "/var/run/containers/storage" - storage_driver = "overlay2" - log_dir = "/var/log/crio/pods" - file_locking = true - [crio.runtime] - runtime = "/usr/bin/runc" - runtime_untrusted_workload = "" - default_workload_trust = "trusted" - conmon = "/usr/local/libexec/crio/conmon" - conmon_env = ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"] - selinux = true - seccomp_profile = "/etc/crio/seccomp.json" - apparmor_profile = "crio-default" - cgroup_manager = "cgroupfs" - hooks_dir = ["/usr/share/containers/oci/hooks.d"] - pids_limit = 2048 - container_exits_dir = "/var/run/podman/exits" - [crio.image] - default_transport = "docker://" - pause_image = "kubernetes/pause" - pause_command = "/pause" - signature_policy = "" - image_volumes = "mkdir" - [crio.network] - network_dir = "/etc/cni/net.d/" - plugin_dir = "/opt/cni/bin/" |