From 0f50f3901e02a84dfaf1bc8f1d3b6603697b8939 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Wed, 9 Sep 2020 17:31:08 +0300
Subject: [PATCH] cerbero/fedora: install which into the image

We used to get this as transient dependency it seems,
which broke rebuilds of the img once w/e pkg was
depending on it, stopped.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/338>
---
 docker/cerbero/Dockerfile-fedora | 2 +-
 gitlab/ci_template.yml           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/cerbero/Dockerfile-fedora b/docker/cerbero/Dockerfile-fedora
index 2347399ebc..2e8c0e3703 100644
--- a/docker/cerbero/Dockerfile-fedora
+++ b/docker/cerbero/Dockerfile-fedora
@@ -7,7 +7,7 @@ ARG DEFAULT_BRANCH="master"
 # System setup
 RUN echo "fastestmirror=true" >>  /etc/dnf/dnf.conf && \
     dnf upgrade -y && \
-    dnf install -y sudo git lbzip2 rsync wine
+    dnf install -y sudo git lbzip2 rsync wine which
 
 # Configure git for various usage
 RUN git config --global user.email "cerbero@gstreamer.freedesktop.org" && \
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml
index 858b74f845..74073edffa 100644
--- a/gitlab/ci_template.yml
+++ b/gitlab/ci_template.yml
@@ -22,8 +22,8 @@ variables:
   # to change any part of the string of the image you want.
   ###
   FEDORA_TAG:  '2020-07-03.1'
-  CERBERO_TAG: '2020-06-25.0'
-  ANDROID_TAG: '2020-06-25.0'
+  CERBERO_TAG: '2020-09-09.2'
+  ANDROID_TAG: '2020-09-09.2'
   MANIFEST_TAG: '2020-06-25.0'
   TEST_MANIFEST_TAG: '2020-06-25.0'
   INDENT_TAG: '2020-06-29.0'