From d5abe47da6511821ecee3ee3376ec5e209c363d8 Mon Sep 17 00:00:00 2001
From: Shagen Ogandzhanian <shagen.ogandzhanian@jetbrains.com>
Date: Sun, 25 Apr 2021 01:25:42 +0200
Subject: [PATCH] Introduce a separate global gradle distrib in compose-web
 Docker image

---
 ci/docker/compose-web/Dockerfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ci/docker/compose-web/Dockerfile b/ci/docker/compose-web/Dockerfile
index b494c618a0..e1919c837b 100644
--- a/ci/docker/compose-web/Dockerfile
+++ b/ci/docker/compose-web/Dockerfile
@@ -9,12 +9,19 @@ RUN dpkg --add-architecture i386 && apt-get update -yqq && apt-get install -y \
     firefox \
     git \
     gnupg2 \
+    openjdk-11-jdk \
     python3 \
     python-is-python3 \
+    unzip \
     wget
 
-ARG CHROME_VERSION="google-chrome-stable"
+ARG GRADLE_VERSION=6.8.3
+RUN wget https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip -P /tmp
+RUN unzip -d /opt/gradle /tmp/gradle-${GRADLE_VERSION}-bin.zip
+ENV GRADLE_HOME=/opt/gradle/gradle-${GRADLE_VERSION}
+ENV PATH=${GRADLE_HOME}/bin:${PATH}
 
+ARG CHROME_VERSION="google-chrome-stable"
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
 RUN echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
     && apt-get update -yqq && apt-get install -y \