docker: update for the new Android toolchain and predownload GC and gradle

[nit.git] / misc / docker / full / Dockerfile

diff --git a/misc/docker/full/Dockerfile b/misc/docker/full/Dockerfile
index fe6fa82..c19ab91 100644 (file)
--- a/misc/docker/full/Dockerfile
+++ b/misc/docker/full/Dockerfile
@@ -14,12 +14,16 @@ RUN dpkg --add-architecture i386 \
                libgles1-mesa-dev \
                libgles2-mesa-dev \
                libgtk-3-dev \
+               libgmp-dev \
                libncurses5-dev \
                libpq-dev \
+               libreadline-dev \
                libsdl-image1.2-dev \
                libsdl-ttf2.0-dev \
                libsdl1.2-dev \
                libsdl2-dev \
+               libsdl2-image-dev \
+               libsdl2-mixer-dev \
                libsqlite3-dev \
                libx11-dev \
                libxdg-basedir-dev \
@@ -27,6 +31,7 @@ RUN dpkg --add-architecture i386 \
                # Packages needed for contrib, platforms and FFI
                ant \
                clang \
+               cmake \
                default-jdk \
                file \
                inkscape \
@@ -43,31 +48,27 @@ RUN dpkg --add-architecture i386 \
 RUN mkdir -p /opt \
        && cd /opt \
        # Android SDK
-       && curl https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -o android-sdk-linux.tgz \
-       && tar xzf android-sdk-linux.tgz \
-       && rm android-sdk-linux.tgz \
-       && echo y | android-sdk-linux/tools/android update sdk -a --no-ui --filter \
-               # Hardcode minimal known working things
-               platform-tools,build-tools-22.0.1,android-22,android-10 \
-       # Android NDK
-       && curl http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip -o android-ndk.zip \
-       && unzip -q android-ndk.zip \
-       && ln -s android-ndk-r11c android-ndk \
-       && rm android-ndk.zip \
-       && printf "PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK\nexport PATH\n" >> "/etc/profile.d/android.sh"
+       && curl https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -o android-sdk-linux.zip \
+       && unzip android-sdk-linux.zip -d android-sdk-linux \
+       && rm android-sdk-linux.zip \
+       && chmod -R a+X /opt \
+       && yes | android-sdk-linux/tools/bin/sdkmanager --licenses \
+       && android-sdk-linux/tools/bin/sdkmanager "build-tools;27.0.0" "cmake;3.6.4111459" ndk-bundle platform-tools tools
 
-# Setup environment variables
+# Download gradlew and bdwgc for Android
+RUN /nit/share/android-gradlew/gradlew \
+       && /nit/share/android-bdwgc/setup.sh
 
-ENV ANDROID_HOME /opt/android-sdk-linux
-ENV ANDROID_NDK /opt/android-ndk
-ENV PATH $PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK
+# Install OpenGL validator
+RUN git clone https://github.com/KhronosGroup/glslang.git \
+       && mkdir -p glslang/build \
+       && cd glslang/build \
+       && cmake .. \
+       && make \
+       && make
 
-# Run tests
-RUN cd /nit/tests \
-       # Basic tests
-       && ./testfull.sh || true \
-       && rm -rf out/ alt/*.nit \
-       # Nitunits
-       && ../bin/nitunit ../lib ../contrib || true \
-       && rm -rf .nitunit \
-       && ccache -C
+# Setup environment variables
+ENV ANDROID_HOME=/opt/android-sdk-linux/
+ENV JAVA_HOME=/usr/lib/jvm/default-java/
+ENV JNI_LIB_PATH=$JAVA_HOME/jre/lib/amd64/server/
+ENV LD_LIBRARY_PATH=$JAVA_HOME/jre/lib/amd64/server/