From 314c6a8affc6d439f4457fb5553b005a52ba0148 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 23 Jul 2022 12:12:58 +0300 Subject: [PATCH] enhance(scripts/Dockerfile): upgrade ubuntu version Ubuntu 21.10 reached its end of life. --- scripts/Dockerfile | 2 +- scripts/setup-ubuntu.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index aad011ef95..af7f6d9866 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:21.10 +FROM ubuntu:22.04 # Fix locale to avoid warnings: ENV LANG en_US.UTF-8 diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 887fe242d5..8497ff7a96 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -152,7 +152,7 @@ PACKAGES+=" luajit" PACKAGES+=" bc" # Java. -PACKAGES+=" openjdk-8-jdk openjdk-16-jdk" +PACKAGES+=" openjdk-8-jdk openjdk-18-jdk" # needed by ovmf PACKAGES+=" libarchive-tools"