~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #222 from michalbednarski/gnupg-x86-asm-pie
[termux-packages]
/
Dockerfile
diff --git
a/Dockerfile
b/Dockerfile
index
0e00c28
..
4d550c9
100644
(file)
--- 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
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 \
RUN apt-get update && apt-get install -y \
sudo \
+ git \
asciidoc \
automake \
bison \
asciidoc \
automake \
bison \
@@
-49,12
+50,12
@@
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 && \
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 && \
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 && \
mkdir /root/lib && \
mv /tmp/android-sdk-linux /root/lib/android-sdk && \
- mv /tmp/android-ndk-r1
0e
/root/lib/android-ndk && \
+ mv /tmp/android-ndk-r1
1
/root/lib/android-ndk && \
rm -fr /tmp/*
RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages && \
rm -fr /tmp/*
RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages && \
@@
-63,7
+64,7
@@
RUN mkdir -p /data/data/com.termux/files/usr && mkdir -p /root/termux-packages &
luarocks install lua-MessagePack && \
luarocks install luabitop
luarocks install lua-MessagePack && \
luarocks install luabitop
-ADD
*.py /root/termux-packages/
+ADD
scripts /root/termux-packages/scripts
ADD *.sh /root/termux-packages/
ADD *.spec /root/termux-packages/
ADD packages /root/termux-packages/packages
ADD *.sh /root/termux-packages/
ADD *.spec /root/termux-packages/
ADD packages /root/termux-packages/packages