diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-22 15:24:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 15:24:36 -0700 |
| commit | d652c8656d7425c34234071eddb55cbba9ac070f (patch) | |
| tree | 4c73d58159e530c7fb0202dbc06e4ed4473e172e /libpod.conf | |
| parent | a2487aec6703b0b37a1b53e0b53534e3517d2124 (diff) | |
| parent | 615a9e9f78eee0038b8803eb1223541fe28c6e16 (diff) | |
| download | podman-d652c8656d7425c34234071eddb55cbba9ac070f.tar.gz podman-d652c8656d7425c34234071eddb55cbba9ac070f.tar.bz2 podman-d652c8656d7425c34234071eddb55cbba9ac070f.zip | |
Merge pull request #2919 from rhatdan/infra_command
Internal names do not match external names
Diffstat (limited to 'libpod.conf')
| -rw-r--r-- | libpod.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpod.conf b/libpod.conf index 211ba106d..80422e3dd 100644 --- a/libpod.conf +++ b/libpod.conf @@ -71,11 +71,11 @@ cni_default_network = "podman" # 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 infra (pause) image name for pod infra containers +infra_image = "k8s.gcr.io/pause:3.1" -# Default command to run the pause container -pause_command = "/pause" +# 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, |