From 62dea73fdf080adff1de046c5741243ecbc1e419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 15 Sep 2018 23:12:39 -0400
Subject: [PATCH] build: use gradle from docker image
Prevents downloading gradle every build
Change-Id: I920d51bb7712e2f6aaf3f6845bae3f98bcb02ff6
---
compile.sh | 4 ++--
docker/Dockerfile | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/compile.sh b/compile.sh
index 639ffc2d2..497f11a4b 100755
--- a/compile.sh
+++ b/compile.sh
@@ -52,9 +52,9 @@ if [[ $NO_GRADLE -eq 0 ]]; then
fi
if [[ $DAEMON_ONLY -eq 0 ]]; then
if [[ $RELEASE -eq 1 ]]; then
- cd $TOP && ./gradlew $GRADLE_PROPERTIES assembleRelease
+ cd $TOP && gradle $GRADLE_PROPERTIES assembleRelease
else
- cd $TOP && ./gradlew $GRADLE_PROPERTIES assembleDebug
+ cd $TOP && gradle $GRADLE_PROPERTIES assembleDebug
fi
fi
else
diff --git a/docker/Dockerfile b/docker/Dockerfile
index be3b2e549..0b0b8c14d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM gradle:jdk8
ENV LANG en_US.utf8
ENV LC_ALL en_US.utf8
@@ -20,13 +20,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
bzip2 \
doxygen \
git \
- gradle \
lib32stdc++6 \
lib32z1 \
libtool \
locales \
m4 \
- openjdk-8-jdk \
pkg-config \
software-properties-common \
ssh \
@@ -37,8 +35,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
yasm \
nasm \
zip \
- && locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL \
- && update-java-alternatives --set java-1.8.0-openjdk
+ && locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL
# Android SDK tools
RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
--
GitLab