update the Dockerfile in the .buildbot/kivy

.buildbot/android/Dockerfile

@@ -1,78 +1,117 @@
+
 # A container for buildbot
 FROM ubuntu:bionic AS android
 # FROM ubuntu:20.04 AS buildbot-bionic
 
-RUN apt -y update -qq
+ENV ANDROID_HOME="/opt/android"
-RUN apt -y install wget
 
-RUN wget -nc "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"
+RUN apt -y update -qq \
-RUN wget -nc "https://dl.google.com/android/repository/android-ndk-r23b-linux.zip"
+    && apt -y install -qq --no-install-recommends curl unzip ca-certificates \
-RUN wget -nc "http://archive.apache.org/dist/ant/binaries/apache-ant-1.10.12-bin.tar.gz"
+    && apt -y autoremove
 
-# SYSTEM DEPENDENCIES
 
-RUN apt -y install --no-install-recommends python3-pip \
+ENV ANDROID_NDK_HOME="${ANDROID_HOME}/android-ndk"
-    pip3 python3 virtualenv python3-setuptools \
+ENV ANDROID_NDK_VERSION="22b"
-    python3-wheel git unzip sudo patch bzip2 lzma
+ENV ANDROID_NDK_HOME_V="${ANDROID_NDK_HOME}-r${ANDROID_NDK_VERSION}"
-RUN apt -y autoremove
 
-# BUILD DEPENDENCIES
+# get the latest version from https://developer.android.com/ndk/downloads/index.html
+ENV ANDROID_NDK_ARCHIVE="android-ndk-r${ANDROID_NDK_VERSION}-linux-x86_64.zip"
+ENV ANDROID_NDK_DL_URL="https://dl.google.com/android/repository/${ANDROID_NDK_ARCHIVE}"
 
-RUN dpkg --add-architecture i386
+# download and install Android NDK
-RUN apt -y update -qq    
+RUN curl "${ANDROID_NDK_DL_URL}" \
-RUN apt -y install -qq --no-install-recommends build-essential \
+        --output "${ANDROID_NDK_ARCHIVE}" \
-    ccache git python3 python3-dev libncurses5:i386 libstdc++6:i386 \
+    && mkdir --parents "${ANDROID_NDK_HOME_V}" \
-    libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 \
+    && unzip -q "${ANDROID_NDK_ARCHIVE}" -d "${ANDROID_HOME}" \
-    libidn11:i386 zip zlib1g-dev zlib1g:i386
+    && ln -sfn "${ANDROID_NDK_HOME_V}" "${ANDROID_NDK_HOME}" \
-RUN apt -y autoremove
+    && rm -rf "${ANDROID_NDK_ARCHIVE}"
-RUN apt -y clean
 
-# RECIPES DEPENDENCIES
+ENV ANDROID_SDK_HOME="${ANDROID_HOME}/android-sdk"
 
-RUN dpkg --add-architecture i386
+# get the latest version from https://developer.android.com/studio/index.html
-RUN apt -y update -qq
+ENV ANDROID_SDK_TOOLS_VERSION="8092744"
-RUN apt -y install -qq --no-install-recommends libffi-dev autoconf \
+ENV ANDROID_SDK_BUILD_TOOLS_VERSION="30.0.3"
-    automake cmake gettext libltdl-dev libtool pkg-config
+ENV ANDROID_SDK_TOOLS_ARCHIVE="commandlinetools-linux-${ANDROID_SDK_TOOLS_VERSION}_latest.zip"
-RUN apt -y autoremove
+ENV ANDROID_SDK_TOOLS_DL_URL="https://dl.google.com/android/repository/${ANDROID_SDK_TOOLS_ARCHIVE}"
-RUN apt -y clean
+ENV ANDROID_SDK_MANAGER="${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME}"
+
+# download and install Android SDK
+RUN curl "${ANDROID_SDK_TOOLS_DL_URL}" \
+        --output "${ANDROID_SDK_TOOLS_ARCHIVE}" \
+    && mkdir --parents "${ANDROID_SDK_HOME}" \
+    && unzip -q "${ANDROID_SDK_TOOLS_ARCHIVE}" -d "${ANDROID_SDK_HOME}" \
+    && mv "${ANDROID_SDK_HOME}/cmdline-tools" "${ANDROID_SDK_HOME}/tools" \
+    && rm -rf "${ANDROID_SDK_TOOLS_ARCHIVE}"
+
+# update Android SDK, install Android API, Build Tools...
+RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
+    && echo '### User Sources for Android SDK Manager' \
+        > "${ANDROID_SDK_HOME}/.android/repositories.cfg"
+
+# accept Android licenses (JDK necessary!)
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        openjdk-11-jdk-headless \
+    && apt -y autoremove
+RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null
+
+# download platforms, API, build tools
+RUN ${ANDROID_SDK_MANAGER} "platforms;android-30" > /dev/null && \
+    ${ANDROID_SDK_MANAGER} "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null && \
+    ${ANDROID_SDK_MANAGER} "extras;android;m2repository" > /dev/null && \
+    chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
+
+# download ANT
+ENV APACHE_ANT_VERSION="1.9.4"
+ENV APACHE_ANT_ARCHIVE="apache-ant-${APACHE_ANT_VERSION}-bin.tar.gz"
+ENV APACHE_ANT_DL_URL="https://archive.apache.org/dist/ant/binaries/${APACHE_ANT_ARCHIVE}"
+ENV APACHE_ANT_HOME="${ANDROID_HOME}/apache-ant"
+ENV APACHE_ANT_HOME_V="${APACHE_ANT_HOME}-${APACHE_ANT_VERSION}"
+
+RUN curl "${APACHE_ANT_DL_URL}" \
+        --output "${APACHE_ANT_ARCHIVE}" \
+    && tar -xf "${APACHE_ANT_ARCHIVE}" -C "${ANDROID_HOME}" \
+    && ln -sfn "${APACHE_ANT_HOME_V}" "${APACHE_ANT_HOME}" \
+    && rm -rf "${APACHE_ANT_ARCHIVE}"
+
+# install system/build dependencies
+RUN apt -y update -qq \
+    && apt -y install -qq --no-install-recommends \
+        python3 \
+        python3-dev \
+        python3-pip \
+        python3-setuptools \
+        python3-venv \
+        wget \
+        lbzip2 \
+        bzip2 \
+        lzma \
+        patch \
+        sudo \
+        software-properties-common \
+        git \
+        zip \
+        unzip \
+        build-essential \
+        ccache \
+        autoconf \
+        libtool \
+        pkg-config \
+        zlib1g-dev \
+        libncurses5-dev \
+        libncursesw5-dev \
+        libtinfo5 \
+        cmake \
+        libffi-dev \
+        libssl-dev \
+        automake \
+        gettext \
+        libltdl-dev \
+        libidn11 \
+    && apt -y autoremove \
+    && apt -y clean
 
 # INSTALL ANDROID PACKAGES
 
 RUN pip3 install buildozer==1.2.0 
-RUN pip3 install --upgrade cython==0.29.15
+RUN pip3 install --upgrade cython==0.29.15
-
-# INSTALL NDK
-
-# get the latest version from https://developer.android.com/ndk/downloads/index.html
-RUN mkdir --parents "/opt/android/android-ndk-r23b"
-RUN unzip -q "android-ndk-r23b-linux.zip" -d "/opt/android"
-RUN ln -sfn "/opt/android/android-ndk-r23b" "/opt/android/android-ndk"
-RUN rm -rf "android-ndk-r23b-linux.zip"
-
-# INSTALL APACHE-ANT
-
-RUN tar -xf "apache-ant-1.10.12-bin.tar.gz" -C "/opt/android"
-RUN ln -sfn "/opt/android/apache-ant-1.10.12" "/opt/android/apache-ant"
-RUN rm -rf "apache-ant-1.10.12-bin.tar.gz"
-
-# INSTALL SDK
-
-# get the latest version from https://developer.android.com/studio/index.html
-RUN mkdir --parents "/opt/android/android-sdk"
-RUN unzip -q "sdk-tools-linux-4333796.zip" -d "/opt/android/android-sdk"
-RUN rm -rf "sdk-tools-linux-4333796.zip"
- # update Android SDK, install Android API, Build Tools...
-RUN mkdir --parents "/opt/android/android-sdk/.android/" 
-# accept Android licenses (JDK necessary!)
-RUN apt -y update -qq
-RUN apt -y install -qq --no-install-recommends openjdk-11-jdk
-RUN apt -y autoremove
-RUN yes | "/opt/android/android-sdk/tools/bin/sdkmanager" "build-tools;29.0.2" > /dev/null    
-# download platforms, API, build tools
-RUN "/opt/android/android-sdk/tools/bin/sdkmanager" "platforms;android-24" > /dev/null
-RUN "/opt/android/android-sdk/tools/bin/sdkmanager" "platforms;android-28" > /dev/null
-RUN "/opt/android/android-sdk/tools/bin/sdkmanager" "build-tools;29.0.2" > /dev/null
-RUN "/opt/android/android-sdk/tools/bin/sdkmanager" "extras;android;m2repository" > /dev/null
-RUN find /opt/android/android-sdk -type f -perm /0111 -print0|xargs -0 chmod a+x
-RUN chown -R buildbot.buildbot /opt/android/android-sdk
-RUN chmod +x "/opt/android/android-sdk/tools/bin/avdmanager"