container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-21 17:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3003 from cevich/temp_selinux_workaround

Browse source 
Cirrus: Temp. override container-selinux on F29
This commit is contained in:
OpenShift Merge Robot 2019-04-24 09:50:12 -07:00 committed by GitHub
parent d652c8656d 72007746aa
commit b4cba6090d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/cirrus/lib.sh
View file

@ -178,7 +178,6 @@ setup_rootless() {
make install.catatonit make install.catatonit
go get github.com/onsi/ginkgo/ginkgo go get github.com/onsi/ginkgo/ginkgo
go get github.com/onsi/gomega/... go get github.com/onsi/gomega/...
dnf -y update runc
# Guarantee independence from specific values # Guarantee independence from specific values
ROOTLESS_UID=$[RANDOM+1000] ROOTLESS_UID=$[RANDOM+1000]

11
contrib/cirrus/setup_environment.sh
View file

@ -58,11 +58,14 @@ then
# Always install runc on Ubuntu # Always install runc on Ubuntu
install_runc_from_git install_runc_from_git
;; ;;
fedora-29) ;& # Continue to the next item fedora-29)
CON_SEL="https://kojipkgs.fedoraproject.org/packages/container-selinux/2.100/1.git3b78187.fc29/noarch/container-selinux-2.100-1.git3b78187.fc29.noarch.rpm"
echo ">>>>> OVERRIDING container-selinux WITH $CON_SEL <<<<<"
dnf -y install $CON_SEL
;& # Continue to the next item
fedora-28) fedora-28)
RUNC="https://kojipkgs.fedoraproject.org/packages/runc/1.0.0/55.dev.git578fe65.fc${OS_RELEASE_VER}/x86_64/runc-1.0.0-55.dev.git578fe65.fc${OS_RELEASE_VER}.x86_64.rpm" echo ">>>>> OVERRIDING source-built runc with latest package <<<<<"
echo ">>>>> OVERRIDING RUNC WITH $RUNC <<<<<" dnf update -y runc
dnf -y install "$RUNC"
;& # Continue to the next item ;& # Continue to the next item
centos-7) ;& centos-7) ;&
rhel-7) rhel-7)