X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/05e29c5b696ad5151e740c9eb5619778133fb931..d0195549d7b50b84fec1f1ff889861817730c6be:/scripts/Dockerfile diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 102b1edd..49bcb07e 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -4,7 +4,7 @@ # 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.10 # Fix locale to avoid warnings: ENV LANG C.UTF-8 @@ -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 sources/cxx-stl/gnu-libstdc++ && \ 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':