X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e59984067b5a2530ef1afeeaa24161a6242e0c73..38d6235c76c0803fa9dc7c7bb7549f4bd3d0f6e5:/scripts/Dockerfile

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 2c750466..4c894089 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -4,14 +4,14 @@
 # 	docker push termux/package-builder
 # This is done after changing this file or any of the
 # scripts/setup-{ubuntu,android-sdk}.sh setup scripts.
-FROM ubuntu:16.10
+FROM ubuntu:17.04
 
 # Fix locale to avoid warnings:
 ENV LANG C.UTF-8
 
 # Needed for setup:
-ADD ./setup-ubuntu.sh /tmp/setup-ubuntu.sh
-ADD ./setup-android-sdk.sh /tmp/setup-android-sdk.sh
+COPY ./setup-ubuntu.sh /tmp/setup-ubuntu.sh
+COPY ./setup-android-sdk.sh /tmp/setup-android-sdk.sh
 
 # Setup needed packages and the Android SDK and NDK:
 RUN apt-get update && \
@@ -27,8 +27,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     cd /home/builder/lib/android-ndk/ && \
     rm -Rf toolchains/mips* && \
-    rm -Rf sources/cxx-stl/gabi++ sources/cxx-stl/llvm-libc++* sources/cxx-stl/system/ sources/cxx-stl/stlport && \
-    cd platforms && ls | grep -v android-21 | xargs rm -Rf && \
+    rm -Rf sources/cxx-stl/gabi++ sources/cxx-stl/system/ sources/cxx-stl/stlport && \
     cd /home/builder/lib/android-sdk/tools && rm -Rf emulator* lib* proguard templates
 
 # We expect this to be mounted with '-v $PWD:/home/builder/termux-packages':