docker/fedora: avoid hardcoding the fedora version in the setup script
authorJordan Petridis <jordan@centricular.com>
Mon, 15 Jul 2019 09:06:38 +0000 (12:06 +0300)
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Mon, 15 Jul 2019 09:13:29 +0000 (09:13 +0000)
docker/fedora/prepare.sh

index 15467bd..e0b9873 100644 (file)
@@ -7,11 +7,10 @@ git config --global user.email "gst-build@gstreamer.net"
 git config --global user.name "Gstbuild Runner"
 
 # Add rpm fusion repositories in order to access all of the gst plugins
-dnf install -y "http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm" \
-  "http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-30.noarch.rpm"
+sudo dnf install -y \
+  "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"
 
-rpm --import "/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-30"
-rpm --import "/etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-30"
 dnf upgrade -y
 
 # Enable the cisco openh264 repo