docker-full: install the android platforms needed by current packages

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

diff --git a/misc/docker/full/Dockerfile b/misc/docker/full/Dockerfile
index df0d214..2d7fcbb 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 \
@@ -48,29 +52,16 @@ 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"
 
 # 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
-
-# Run tests
-RUN cd /root/nit/tests \
-       # Basic tests
-       && ./testfull.sh || true \
-       && rm -rf out/ alt/*.nit \
-       # Nitunits
-       && ../bin/nitunit ../lib ../contrib || true \
-       && rm -rf .nitunit \
-       && ccache -C
-
-WORKDIR /root/nit
-ENTRYPOINT [ "bash" ]