docker-full: java: setup needed environment variables

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

diff --git a/misc/docker/full/Dockerfile b/misc/docker/full/Dockerfile
index 11020d0..eb7f26d 100644 (file)
--- a/misc/docker/full/Dockerfile
+++ b/misc/docker/full/Dockerfile
@@ -31,6 +31,7 @@ RUN dpkg --add-architecture i386 \
                # Packages needed for contrib, platforms and FFI
                ant \
                clang \
+               cmake \
                default-jdk \
                file \
                inkscape \
@@ -52,7 +53,7 @@ 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 \
@@ -61,7 +62,18 @@ RUN mkdir -p /opt \
        && 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/