Skip to content
Snippets Groups Projects
Commit 62dea73f authored by Adrien Béraud's avatar Adrien Béraud
Browse files

build: use gradle from docker image

Prevents downloading gradle every build

Change-Id: I920d51bb7712e2f6aaf3f6845bae3f98bcb02ff6
parent 54ef5a75
Branches
Tags
No related merge requests found
...@@ -52,9 +52,9 @@ if [[ $NO_GRADLE -eq 0 ]]; then ...@@ -52,9 +52,9 @@ if [[ $NO_GRADLE -eq 0 ]]; then
fi fi
if [[ $DAEMON_ONLY -eq 0 ]]; then if [[ $DAEMON_ONLY -eq 0 ]]; then
if [[ $RELEASE -eq 1 ]]; then if [[ $RELEASE -eq 1 ]]; then
cd $TOP && ./gradlew $GRADLE_PROPERTIES assembleRelease cd $TOP && gradle $GRADLE_PROPERTIES assembleRelease
else else
cd $TOP && ./gradlew $GRADLE_PROPERTIES assembleDebug cd $TOP && gradle $GRADLE_PROPERTIES assembleDebug
fi fi
fi fi
else else
......
FROM ubuntu:18.04 FROM gradle:jdk8
ENV LANG en_US.utf8 ENV LANG en_US.utf8
ENV LC_ALL en_US.utf8 ENV LC_ALL en_US.utf8
...@@ -20,13 +20,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ...@@ -20,13 +20,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
bzip2 \ bzip2 \
doxygen \ doxygen \
git \ git \
gradle \
lib32stdc++6 \ lib32stdc++6 \
lib32z1 \ lib32z1 \
libtool \ libtool \
locales \ locales \
m4 \ m4 \
openjdk-8-jdk \
pkg-config \ pkg-config \
software-properties-common \ software-properties-common \
ssh \ ssh \
...@@ -37,8 +35,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ...@@ -37,8 +35,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
yasm \ yasm \
nasm \ nasm \
zip \ zip \
&& locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL \ && locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL
&& update-java-alternatives --set java-1.8.0-openjdk
# Android SDK tools # Android SDK tools
RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \ RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment