diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index 82abdd3a40..624cfcdcb8 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:30 +FROM registry.fedoraproject.org/fedora:31 ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh index ad95512772..410f48c089 100644 --- a/docker/fedora/prepare.sh +++ b/docker/fedora/prepare.sh @@ -4,7 +4,7 @@ set -eux # We need them to cleanly build our doc. sed -i "s/tsflags=nodocs//g" /etc/dnf/dnf.conf -dnf install -y git-core ninja-build dnf-plugins-core +dnf install -y git-core ninja-build dnf-plugins-core python3-pip # Configure git for various usage git config --global user.email "gst-build@gstreamer.net" @@ -21,7 +21,6 @@ dnf upgrade -y dnf install -y \ aalib-devel \ aom \ - aom-extra-tools \ bat \ libaom \ libaom-devel \ @@ -47,6 +46,7 @@ dnf install -y \ graphene-devel \ gsl \ gsl-devel \ + faac-devel \ ffmpeg \ ffmpeg-libs \ ffmpeg-devel \ @@ -184,7 +184,6 @@ dnf builddep -y gstreamer1 \ gstreamer1-plugins-good-extras \ gstreamer1-plugins-ugly \ gstreamer1-plugins-ugly-free \ - gstreamer1-plugins-bad-nonfree \ gstreamer1-plugins-bad-free \ gstreamer1-plugins-bad-free-extras \ gstreamer1-plugins-bad-freeworld \ diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index bbb129952c..8b34b16d51 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -18,7 +18,7 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2020-07-03.0' + FEDORA_TAG: '2020-07-03.1' CERBERO_TAG: '2020-06-25.0' ANDROID_TAG: '2020-06-25.0' MANIFEST_TAG: '2020-06-25.0'