Merge pull request #11329 from termux/docker-image

Ubuntu 22.04 LTS for package-builder image.
This commit is contained in:
Leonid Pliushch 2022-07-23 14:30:37 +03:00 committed by GitHub
commit c7b509245b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -1,10 +1,10 @@
# Build with:
# docker build -t termux/package-builder .
# Push to docker hub with:
# docker push termux/package-builder
# docker build -t ghcr.io/termux/package-builder .
# Push to GitHub registry with:
# docker push ghcr.io/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

View File

@ -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"