File tree Expand file tree Collapse file tree 1 file changed +28
-34
lines changed Expand file tree Collapse file tree 1 file changed +28
-34
lines changed Original file line number Diff line number Diff line change 1818# If platform is not specified, by default the target platform of the build request is used.
1919# This is not what we want, as Google doesn't provide a linux/arm64 compatible NDK.
2020# See: https://docs.docker.com/engine/reference/builder/#from
21- FROM --platform=linux/amd64 ubuntu:20 .04
21+ FROM --platform=linux/amd64 ubuntu:22 .04
2222
2323# configure locale
2424RUN apt -y update -qq > /dev/null \
@@ -48,43 +48,37 @@ ENV HOME_DIR="/home/${USER}"
4848ENV WORK_DIR="${HOME_DIR}/app" \
4949 PATH="${HOME_DIR}/.local/bin:${PATH}" \
5050 ANDROID_HOME="${HOME_DIR}/.android" \
51- JAVA_HOME="/usr/lib/jvm/java-13 -openjdk-amd64"
51+ JAVA_HOME="/usr/lib/jvm/java-17 -openjdk-amd64"
5252
5353
5454# install system dependencies
55- RUN dpkg --add-architecture i386 \
56- && ${RETRY} apt -y update -qq > /dev/null \
55+ RUN ${RETRY} apt -y update -qq > /dev/null \
5756 && ${RETRY} DEBIAN_FRONTEND=noninteractive apt install -qq --yes --no-install-recommends \
58- autoconf \
59- automake \
60- autopoint \
61- build-essential \
62- ccache \
63- cmake \
64- gettext \
65- git \
66- lbzip2 \
67- libffi-dev \
68- libgtk2.0-0:i386 \
69- libidn11:i386 \
70- libltdl-dev \
71- libncurses5:i386 \
72- libssl-dev \
73- libstdc++6:i386 \
74- libtool \
75- openjdk-13-jdk \
76- patch \
77- pkg-config \
78- python3 \
79- python3-dev \
80- python3-pip \
81- python3-venv \
82- sudo \
83- unzip \
84- wget \
85- zip \
86- zlib1g-dev \
87- zlib1g:i386 \
57+ ant \
58+ autoconf \
59+ automake \
60+ ccache \
61+ cmake \
62+ g++ \
63+ gcc \
64+ git \
65+ lbzip2 \
66+ libffi-dev \
67+ libltdl-dev \
68+ libtool \
69+ libssl-dev \
70+ openjdk-17-jdk \
71+ patch \
72+ unzip \
73+ zip \
74+ pkg-config \
75+ python3 \
76+ python3-dev \
77+ python3-pip \
78+ python3-venv \
79+ make \
80+ sudo \
81+ wget \
8882 && apt -y autoremove \
8983 && apt -y clean \
9084 && rm -rf /var/lib/apt/lists/*
You can’t perform that action at this time.
0 commit comments