From 2a5e6ec7ea7d3df9549ac5e7778f626a2d5981f9 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 27 Apr 2019 22:47:56 +0200
Subject: [PATCH] Update docker image to ubuntu 19.04 and llvm 8

---
 scripts/Dockerfile           |  2 +-
 scripts/setup-android-sdk.sh |  4 ++--
 scripts/setup-ubuntu.sh      | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index dc512fceb..c6e7e3d4c 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:18.10
+FROM ubuntu:19.04
 
 # Fix locale to avoid warnings:
 ENV LANG C.UTF-8
diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh
index d76b2c2e5..6ef096d1e 100755
--- a/scripts/setup-android-sdk.sh
+++ b/scripts/setup-android-sdk.sh
@@ -42,5 +42,5 @@ fi
 
 yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
 
-# The android-21 platform is used in the ecj package:
-yes | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-28" "platforms;android-21"
+# The android platforms are used in the ecj and apksigner packages:
+yes | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "build-tools;${TERMUX_ANDROID_BUILD_TOOLS_VERSION}" "platforms;android-28" "platforms;android-24" "platforms;android-21"
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index 70fc32735..19c23278f 100755
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -24,7 +24,6 @@ PACKAGES+=" python3.7"
 PACKAGES+=" tar"
 PACKAGES+=" unzip"
 PACKAGES+=" m4"
-PACKAGES+=" openjdk-8-jdk-headless" # Used for android-sdk.
 PACKAGES+=" pkg-config"
 PACKAGES+=" python3-docutils" # For rst2man, used by mpv.
 PACKAGES+=" python3-setuptools" # Needed by at least asciinema.
@@ -41,7 +40,7 @@ PACKAGES+=" gnupg" # Needed to verify downloaded .debs
 PACKAGES+=" jq" # Needed by bintray upload script.
 PACKAGES+=" lua5.3" # Needed to build luarocks package.
 PACKAGES+=" python3-recommonmark" # needed for llvm-8 documentation
-PACKAGES+=" llvm-7-tools" # so we don't build llvm for build
+PACKAGES+=" llvm-8-tools" # so we don't build llvm for build
 PACKAGES+=" openssl" # Needed by swi-prolog
 PACKAGES+=" libssl-dev:i386" # Needed by swi-prolog 32-bit
 PACKAGES+=" zlib1g-dev:i386"
@@ -53,5 +52,13 @@ sudo apt-get -yq update
 sudo DEBIAN_FRONTEND=noninteractive \
 	apt-get install -yq --no-install-recommends $PACKAGES
 
+# Make openjdk 8 available:
+curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb
+curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u191-b12-2ubuntu0.18.10.1_amd64.deb
+curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u191-b12-2ubuntu0.18.10.1_amd64.deb
+curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb
+sudo dpkg -i openjdk-8-jre-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jre_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb || sudo apt install -f -y
+rm openjdk-8-jre-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jre_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk_8u191-b12-2ubuntu0.18.10.1_amd64.deb openjdk-8-jdk-headless_8u191-b12-2ubuntu0.18.10.1_amd64.deb
+
 sudo mkdir -p /data/data/com.termux/files/usr
 sudo chown -R $(whoami) /data