add git to ubuntu-setup.sh and Dockerfile,add corkscrew

[termux-packages] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 7f30fbb..859563c 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
@@ -51,11 +56,14 @@ RUN cd /tmp && \
     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
-    ln -s / /system
+    rm -fr /tmp/*
+
+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
 
-RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages
 ADD *.py /root/termux-packages/
 ADD *.sh /root/termux-packages/
 ADD *.spec /root/termux-packages/