diff --git a/compile.sh b/compile.sh index 639ffc2d22615d1fab9be6414eb01d349e5de84b..497f11a4bed02c53c429cd5ca6426fb2978d9468 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 be3b2e549bfeb495dfde58186f80a50866faf190..0b0b8c14da78acfe4e9de5218d36e681d9357d3f 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 && \