Merge: some Docker update

* stretch (thus java8)
* new libs
* better usable android
* better usable java
* opengl validator

Pull-Request: #2517
Reviewed-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile
index ee34149..3d795c2 100644 (file)
--- a/misc/docker/Dockerfile
+++ b/misc/docker/Dockerfile
@@ -1,6 +1,6 @@
 # This is a basic install of Nit on a debian base.
 
-FROM debian:jessie
+FROM debian:stretch
 MAINTAINER Jean Privat <jean@pryen.org>
 
 # Install dependencies

diff --git a/misc/docker/full/Dockerfile b/misc/docker/full/Dockerfile
index e6bfe66..eb7f26d 100644 (file)
--- a/misc/docker/full/Dockerfile
+++ b/misc/docker/full/Dockerfile
@@ -14,8 +14,10 @@ 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 \
@@ -29,6 +31,7 @@ RUN dpkg --add-architecture i386 \
                # Packages needed for contrib, platforms and FFI
                ant \
                clang \
+               cmake \
                default-jdk \
                file \
                inkscape \
@@ -50,15 +53,27 @@ RUN mkdir -p /opt \
        && 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 \
+               platform-tools,build-tools-22.0.1,android-22,android-21,android-19,android-16,android-15,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 \
+       && chmod -R a+X /opt \
        && 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"
 
+# Install OpenGL validator
+RUN git clone https://github.com/KhronosGroup/glslang.git \
+       && mkdir -p glslang/build \
+       && cd glslang/build \
+       && cmake .. \
+       && make \
+       && make
+
 # Setup environment variables
 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
+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/