commit 62dea73fdf080adff1de046c5741243ecbc1e419
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Sat Sep 15 23:12:39 2018 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Fri Jun 07 23:23:37 2019 -0400
tree 6b20314dfa88360f4c1b89f38d1a32fbd8e3f0b1
parent 54ef5a75c9cad877eed317f969750e02f0184e6d

build: use gradle from docker image

Prevents downloading gradle every build

Change-Id: I920d51bb7712e2f6aaf3f6845bae3f98bcb02ff6

compile.sh

diff --git a/compile.sh b/compile.sh
index 639ffc2..497f11a 100755
--- a/compile.sh
+++ b/compile.sh
@@ -52,9 +52,9 @@
     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

docker/Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index be3b2e5..0b0b8c1 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 @@
 	bzip2 \
 	doxygen \
 	git \
-	gradle \
 	lib32stdc++6 \
 	lib32z1 \
 	libtool \
 	locales \
 	m4 \
-	openjdk-8-jdk \
 	pkg-config \
 	software-properties-common \
 	ssh \
@@ -37,8 +35,7 @@
 	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 && \