Make fedora build more CI friendly
This commit is contained in:
parent
18f0d5ba5a
commit
c8f6b026bc
2 changed files with 6 additions and 6 deletions
|
@ -13,10 +13,10 @@ sudo dnf -y install docker
|
||||||
sudo dnf -y groupinstall "C Development Tools and Libraries"
|
sudo dnf -y groupinstall "C Development Tools and Libraries"
|
||||||
sudo dnf -y groupinstall "Development Tools"
|
sudo dnf -y groupinstall "Development Tools"
|
||||||
|
|
||||||
sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
|
sudo dnf -y install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
|
||||||
sudo dnf groupupdate core
|
sudo dnf -y groupupdate core
|
||||||
|
|
||||||
sudo dnf install ffmpeg-libs
|
sudo dnf -y install ffmpeg-libs
|
||||||
|
|
||||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
|
6
test.sh
6
test.sh
|
@ -13,8 +13,8 @@ if [[ -z $DETECTED_OS ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $DETECTED_OS =~ .*:.* ]]; then
|
if [[ $DETECTED_OS =~ .*:.* ]]; then
|
||||||
SYSTEM_NAME=`echo $DETECTED_OS | cut -d':' -f1`
|
SYSTEM_NAME=`echo $DETECTED_OS | cut -d':' -f1`
|
||||||
SYSTEM_VERSION=`echo $DETECTED_OS | cut -d':' -f2`
|
SYSTEM_VERSION=`echo $DETECTED_OS | cut -d':' -f2`
|
||||||
else
|
else
|
||||||
echo "please set DETECTED_OS to system:version"
|
echo "please set DETECTED_OS to system:version"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -36,5 +36,5 @@ if [[ -z $DOCKER_IMAGE ]]; then
|
||||||
DOCKER_IMAGE="$DETECTED_OS"
|
DOCKER_IMAGE="$DETECTED_OS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DOCKER_IMAGE $INSIDER_ROOT_DIR/$DIR/test_insider
|
docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR:Z $DOCKER_IMAGE $INSIDER_ROOT_DIR/$DIR/test_insider
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue