Upgrade linux images to Ubuntu 20.04

Change-Id: I4dcfbe846f7847874908ed8ad84ac615a5a739c1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 0 insertions, 112 deletions

diff --git a/docker/bionic/test-android.Dockerfile b/docker/bionic/test-android.Dockerfile
deleted file mode 100644
index 64d22b8d1..000000000
--- a/docker/bionic/test-android.Dockerfile
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# Android SDK/NDK + Qt for Android for testing Qbs
-#
-FROM ubuntu:bionic
-LABEL Description="Ubuntu test environment for Qbs and Qt for Android"
-
-# Allow colored output on command line.
-ENV TERM=xterm-color
-
-#
-# Make it possible to change UID/GID in the entrypoint script. The docker
-# container usually runs as root user on Linux hosts. When the Docker container
-# mounts a folder on the host and creates files there, those files would be
-# owned by root instead of the current user. Thus we create a user here who's
-# UID will be changed in the entrypoint script to match the UID of the current
-# host user.
-#
-ARG USER_UID=1000
-ARG USER_NAME=devel
-RUN apt-get update -qq && \
-    apt-get install -qq -y \
-        ca-certificates \
-        gosu \
-        sudo && \
-    groupadd -g ${USER_UID} ${USER_NAME} && \
-    useradd -s /bin/bash -u ${USER_UID} -g ${USER_NAME} -o -c "" -m ${USER_NAME} && \
-    usermod -a -G sudo ${USER_NAME} && \
-    echo "%devel         ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
-
-COPY docker/bionic/entrypoint.sh /sbin/entrypoint.sh
-ENTRYPOINT ["/sbin/entrypoint.sh"]
-
-# Qbs build dependencies
-RUN apt-get update -qq && \
-    apt-get install -qq -y --no-install-recommends \
-        ca-certificates \
-        curl \
-        libasan4 \
-        libglib2.0-0 \
-        libgl1-mesa-glx \
-        openjdk-8-jdk-headless \
-        p7zip-full \
-        unzip
-
-ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-RUN echo "export JAVA_HOME=${JAVA_HOME}" > /etc/profile.d/android.sh && \
-    echo "export PATH=${JAVA_HOME}/bin:\${PATH}" >> /etc/profile.d/android.sh
-
-ENV ANDROID_HOME="/home/${USER_NAME}/android"
-ENV ANDROID_SDK_ROOT=${ANDROID_HOME}
-ENV ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk-bundle
-ENV PATH="${JAVA_HOME}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin:$PATH"
-RUN echo "export ANDROID_HOME=/home/${USER_NAME}/android" >> /etc/profile.d/android.sh && \
-    echo "export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" >> /etc/profile.d/android.sh && \
-    echo "export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}" >> /etc/profile.d/android.sh && \
-    echo "export PATH=${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/tools/bin:\$PATH" >> /etc/profile.d/android.sh
-
-#
-# We ned to run the following steps as the target user
-#
-USER ${USER_NAME}
-RUN mkdir ${ANDROID_HOME}
-
-# Get Android SDK TOOLS
-ARG SDK_TOOLS_VERSION="4333796"
-RUN curl -s https://dl.google.com/android/repository/sdk-tools-linux-${SDK_TOOLS_VERSION}.zip > ${ANDROID_HOME}/sdk.zip && \
-    unzip ${ANDROID_HOME}/sdk.zip -d ${ANDROID_HOME} && \
-    rm -v ${ANDROID_HOME}/sdk.zip
-
-# Accept SDK license
-ARG ANDROID_PLATFORM="android-29"
-ARG BUILD_TOOLS="28.0.3"
-RUN yes | sdkmanager --verbose --licenses && \
-          sdkmanager --update && \
-          sdkmanager "platforms;${ANDROID_PLATFORM}" "build-tools;${BUILD_TOOLS}" "platform-tools" "tools" "ndk-bundle" && \
-    /usr/lib/jvm/java-8-openjdk-amd64/bin/keytool -genkey -keystore /home/${USER_NAME}/.android/debug.keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname 'CN=Android Debug,O=Android,C=US'
-
-# Install ndk samples in ${ANDROID_NDK_ROOT}/samples
-RUN cd ${ANDROID_NDK_ROOT} && \
-    curl -sLO https://github.com/android/ndk-samples/archive/master.zip && \
-    unzip -q master.zip && \
-    rm -v master.zip && \
-    mv ndk-samples-master samples
-
-# Install android-BasicMediaDecoder in ${ANDROID_SDK_ROOT}/samples
-RUN mkdir ${ANDROID_SDK_ROOT}/samples && \
-    cd ${ANDROID_SDK_ROOT}/samples && \
-    curl -sLO https://github.com/googlearchive/android-BasicMediaDecoder/archive/master.zip && \
-    unzip -q master.zip && \
-    rm -v master.zip && \
-    mv android-BasicMediaDecoder-master android-BasicMediaDecoder
-
-# Download buildtool to generate aab packages in ${ANDROID_SDK_ROOT}
-RUN cd ${ANDROID_SDK_ROOT} && \
-    curl -sLO https://github.com/google/bundletool/releases/download/0.15.0/bundletool-all-0.15.0.jar
-
-USER root
-
-#
-# Install Qt and Qbs for Linux from qt.io
-#
-ARG QT_VERSION
-COPY scripts/install-qt.sh install-qt.sh
-RUN if [ "${QT_VERSION}" \< "5.14" ]; then \
-        QT_ABIS="android_armv7 android_arm64_v8a android_x86 android_x86_64"; \
-    else \
-        QT_ABIS="any"; \
-    fi; \
-    for abi in ${QT_ABIS}; do \
-        ./install-qt.sh --version ${QT_VERSION} --target android --toolchain ${abi} qtbase qtdeclarative qttools qtimageformats; \
-    done && \
-    echo "export QT_VERSION=${QT_VERSION}" >> /etc/profile.d/qt.sh