diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-16 18:16:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 18:16:34 +0100 |
| commit | 197ebe8b5e6c10db786ad22692536e395c911b87 (patch) | |
| tree | a75c897b014fede28374b62d1bacc81957d3c70d /contrib | |
| parent | f031bd23c6f5f790dde383d542c940bfe2dfaadd (diff) | |
| parent | c8790bfbbb845450608adc7a0a03b77979165f42 (diff) | |
| download | podman-197ebe8b5e6c10db786ad22692536e395c911b87.tar.gz podman-197ebe8b5e6c10db786ad22692536e395c911b87.tar.bz2 podman-197ebe8b5e6c10db786ad22692536e395c911b87.zip | |
Merge pull request #12218 from vrothberg/pause-catatonit
infra container: replace pause with catatonit
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 7 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 3786054a7..90d28b7ac 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -20,6 +20,13 @@ die_unknown() { } msg "************************************************************" +msg "FIXME: force-install catatonit 0.17.0 until CI images are updated" +msg "************************************************************" +# FIXME: this is just a temporary workaround to force-install +# catatonit 0.17.0. Please remove once the images are updated. +./hack/install_catatonit.sh --force + +msg "************************************************************" msg "Setting up runtime environment" msg "************************************************************" show_env_vars diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 474add1af..cb041df6c 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -58,6 +58,7 @@ BuildRequires: libselinux-devel BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd-devel +Requires: catatonit >= 0.1.7 Requires: containers-common Requires: conmon Requires: containernetworking-plugins >= 0.6.0-3 @@ -529,7 +530,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_usr}/lib/tmpfiles.d/podman.conf %dir %{_libexecdir}/%{name} %{_libexecdir}/%{name}/rootlessport -%{_libexecdir}/%{name}/pause/pause %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list |