diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 17:17:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 17:17:27 -0400 |
| commit | 7b00e49f657305f233e4e29613821305bf4d2962 (patch) | |
| tree | 8470c3a4a002f93514762f7fe2eb37cc0396d44b /contrib/cirrus/setup_environment.sh | |
| parent | daabbc1a1e82b840a51b6d769cdf19cfda474144 (diff) | |
| parent | 0e171b7b3327948f2e9e32d9e496736bd7a48009 (diff) | |
| download | podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.gz podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.bz2 podman-7b00e49f657305f233e4e29613821305bf4d2962.zip | |
Merge pull request #6560 from mheon/fix_exec_logdriver
Do not share container log driver for exec
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 323e7c35b..ea2c7d8e0 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -50,6 +50,7 @@ case "${OS_RELEASE_ID}" in if [[ "$OS_RELEASE_VER" == "20" ]]; then apt-get install -y python-is-python3 fi + apt-get upgrade -y conmon ;; fedora) # All SELinux distros need this for systemd-in-a-container |