diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-27 12:53:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 12:53:20 +0100 |
| commit | 340312cc1b4487f6f23cd6b671e7ed71a8421eb8 (patch) | |
| tree | a1f3588d8524538a55563b8a51e5b89d0d89e392 /libpod | |
| parent | 5cd20b3e34263e59c3ab33a8a0f09dc92e4f620b (diff) | |
| parent | 2c4ac55c819a2b155185a5ba45207e560519bbe2 (diff) | |
| download | podman-340312cc1b4487f6f23cd6b671e7ed71a8421eb8.tar.gz podman-340312cc1b4487f6f23cd6b671e7ed71a8421eb8.tar.bz2 podman-340312cc1b4487f6f23cd6b671e7ed71a8421eb8.zip | |
Merge pull request #5636 from vrothberg/pause3.2
use `pause:3.2` image for infra containers
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/define/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/define/config.go b/libpod/define/config.go index 8bd59be75..c06c32471 100644 --- a/libpod/define/config.go +++ b/libpod/define/config.go @@ -4,7 +4,7 @@ var ( // DefaultInitPath is the default path to the container-init binary DefaultInitPath = "/usr/libexec/podman/catatonit" // DefaultInfraImage to use for infra container - DefaultInfraImage = "k8s.gcr.io/pause:3.1" + DefaultInfraImage = "k8s.gcr.io/pause:3.2" // DefaultInfraCommand to be run in an infra container DefaultInfraCommand = "/pause" // DefaultSHMLockPath is the default path for SHM locks |