X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/9f29b4abd8cb8171ce73fa895655c61b58beb31c..202a1fb5d3efb4affe66cabc1f5ed33de0db1d80:/Dockerfile

diff --git a/Dockerfile b/Dockerfile
index abfaea85..4d550c95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:15.04
+FROM ubuntu:15.10
 MAINTAINER Alex Cornejo <acornejo@gmail.com>
 
 # to prevent dialog warnings
@@ -9,6 +9,7 @@ RUN dpkg-reconfigure locales
 
 RUN apt-get update && apt-get install -y \
         sudo \
+        git \
         asciidoc \
         automake \
         bison \
@@ -31,10 +32,14 @@ RUN apt-get update && apt-get install -y \
         libncurses5-dev \
         libssl-dev \
         libtool \
+        libtool-bin \
+        lua-lpeg \
+        luarocks \
         lzip \
         m4 \
         pkg-config \
         scons \
+        subversion \
         texinfo \
         xmlto \
 # Provides u'makedepend' which the openssl build uses
@@ -45,19 +50,21 @@ RUN apt-get update && apt-get install -y \
 
 RUN cd /tmp && \
     curl -O http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz && \
-    curl -O http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin && \
     tar xzvf /tmp/android-sdk_r24.3.4-linux.tgz && \
-    chmod 755 /tmp/android-ndk* && /tmp/android-ndk-r10e-linux-x86_64.bin && \
+    curl -o ndk.zip http://dl.google.com/android/repository/android-ndk-r11-linux-x86_64.zip && \
+    unzip ndk.zip && \
     mkdir /root/lib && \
     mv /tmp/android-sdk-linux /root/lib/android-sdk && \
-    mv /tmp/android-ndk-r10e  /root/lib/android-ndk && \
-    rm -fr /tmp/* && \
-# This link is needed for building git package
-    mkdir -p /system/bin && \
-    ln -s /bin/sh /system/bin/sh
+    mv /tmp/android-ndk-r11 /root/lib/android-ndk && \
+    rm -fr /tmp/*
 
-RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages
-ADD *.py /root/termux-packages/
+RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages && \
+# Install neovim dependencies
+    luarocks install lpeg && \
+    luarocks install lua-MessagePack && \
+    luarocks install luabitop
+
+ADD scripts /root/termux-packages/scripts
 ADD *.sh /root/termux-packages/
 ADD *.spec /root/termux-packages/
 ADD packages /root/termux-packages/packages