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 | |
| 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
| -rw-r--r-- | libpod.conf | 2 | ||||
| -rw-r--r-- | libpod/define/config.go | 2 | ||||
| -rw-r--r-- | test/e2e/config.go | 2 | ||||
| -rw-r--r-- | test/endpoint/endpoint.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libpod.conf b/libpod.conf index 7e0228c19..1bc31eb4c 100644 --- a/libpod.conf +++ b/libpod.conf @@ -74,7 +74,7 @@ cni_default_network = "podman" #namespace = "" # Default infra (pause) image name for pod infra containers -infra_image = "k8s.gcr.io/pause:3.1" +infra_image = "k8s.gcr.io/pause:3.2" # Default command to run the infra container infra_command = "/pause" 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 diff --git a/test/e2e/config.go b/test/e2e/config.go index 95b0481b3..49a47c7da 100644 --- a/test/e2e/config.go +++ b/test/e2e/config.go @@ -10,7 +10,7 @@ var ( ALPINEAMD64ID = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4" ALPINEARM64DIGEST = "docker.io/library/alpine@sha256:db7f3dcef3d586f7dd123f107c93d7911515a5991c4b9e51fa2a43e46335a43e" ALPINEARM64ID = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672" - infra = "k8s.gcr.io/pause:3.1" + infra = "k8s.gcr.io/pause:3.2" BB = "docker.io/library/busybox:latest" healthcheck = "docker.io/libpod/alpine_healthcheck:latest" ImageCacheDir = "/tmp/podman/imagecachedir" diff --git a/test/endpoint/endpoint.go b/test/endpoint/endpoint.go index f1634b6f0..5b5484865 100644 --- a/test/endpoint/endpoint.go +++ b/test/endpoint/endpoint.go @@ -26,7 +26,7 @@ var ( ImageCacheDir = "/tmp/podman/imagecachedir" VarlinkBinary = "/usr/bin/varlink" ALPINE = "docker.io/library/alpine:latest" - infra = "k8s.gcr.io/pause:3.1" + infra = "k8s.gcr.io/pause:3.2" BB = "docker.io/library/busybox:latest" redis = "docker.io/library/redis:alpine" fedoraMinimal = "quay.io/libpod/fedora-minimal:latest" |