diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-03 00:02:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 00:02:20 +0200 |
| commit | 26bb48951fa55924fd4cdb9b2ef72e19a471b959 (patch) | |
| tree | 202118fd8fe72e215b9795cb8d1f506a69dc62cb /contrib | |
| parent | 4632a4b706e94fce7f85e53659dd04484d988ac7 (diff) | |
| parent | 69020c7040415b532f4fe5aaaacdbd288a67b71e (diff) | |
| download | podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.tar.gz podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.tar.bz2 podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.zip | |
Merge pull request #6468 from mheon/remote_detached_exec
Enable detached exec for remote
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 3 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 945b33909..25b7ff941 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -46,6 +46,9 @@ case "${OS_RELEASE_ID}" in workaround_bfq_bug + # HACK: Need Conmon 2.0.17, currently in updates-testing on F31. + dnf update -y --enablerepo=updates-testing conmon + if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then bash "$SCRIPT_BASE/add_second_partition.sh" fi diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 701b5f0b1..9ab0db3ae 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -33,7 +33,7 @@ # People want conmon packaged with the copr rpm %global import_path_conmon github.com/containers/conmon %global git_conmon https://%{import_path_conmon} -%global commit_conmon d532caebc788fafdd2a305b68cd1983b4039bea4 +%global commit_conmon 41877362fc4685d55e0473d2e4a1cbe5e1debee0 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman |