From 65c18304c4518cf39249b44ff2176f8f7de37fce Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 29 Jan 2020 16:43:34 +0200 Subject: [PATCH] docker/fedora: upgrade base images to f31 All the images except the gst-build fedora image, due to further changes being needed --- docker/android/Dockerfile | 2 +- docker/cerbero/Dockerfile-fedora | 4 +++- docker/test_manifest/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/android/Dockerfile b/docker/android/Dockerfile index b95dd87dea..05a7ab49ae 100644 --- a/docker/android/Dockerfile +++ b/docker/android/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:29 +FROM registry.fedoraproject.org/fedora:31 ENV ANDROID_HOME=/android/sdk ENV ANDROID_NDK_HOME=/android/ndk diff --git a/docker/cerbero/Dockerfile-fedora b/docker/cerbero/Dockerfile-fedora index ae5c17682f..b3d22d9200 100644 --- a/docker/cerbero/Dockerfile-fedora +++ b/docker/cerbero/Dockerfile-fedora @@ -1,4 +1,6 @@ -FROM registry.fedoraproject.org/fedora:30 +FROM registry.fedoraproject.org/fedora:31 + +ENV TERM="dumb" # System setup RUN echo "fastestmirror=true" >> /etc/dnf/dnf.conf && \ diff --git a/docker/test_manifest/Dockerfile b/docker/test_manifest/Dockerfile index efadb5af83..cdc369c822 100644 --- a/docker/test_manifest/Dockerfile +++ b/docker/test_manifest/Dockerfile @@ -1,8 +1,8 @@ -FROM registry.fedoraproject.org/fedora:29 +FROM registry.fedoraproject.org/fedora:31 RUN dnf install -y \ python3-pytest \ python3-requests \ python3-pytest-cov \ git-core \ - && rm -rf /var/cache/dnf /var/log/dnf* \ No newline at end of file + && rm -rf /var/cache/dnf /var/log/dnf*