From 018194f4a832b406999762fdac3417dfbcb9b9cb Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Thu, 10 Sep 2020 18:16:33 +0200 Subject: Upgrade linux images to Ubuntu 20.04 Change-Id: I4dcfbe846f7847874908ed8ad84ac615a5a739c1 Reviewed-by: Christian Kandeler --- docker/focal/Dockerfile | 109 ++++++++++++++++++++++++++++++++ docker/focal/test-android.Dockerfile | 112 +++++++++++++++++++++++++++++++++ docker/focal/test-baremetal.Dockerfile | 2 +- 3 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 docker/focal/Dockerfile create mode 100644 docker/focal/test-android.Dockerfile (limited to 'docker/focal') diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile new file mode 100644 index 000000000..e4e239529 --- /dev/null +++ b/docker/focal/Dockerfile @@ -0,0 +1,109 @@ +# +# Install Qt and Qbs for Linux +# +FROM ubuntu:focal +LABEL Description="Ubuntu development environment for Qbs with Qt and various dependencies for testing Qbs modules and functionality" +ARG QT_VERSION +ARG QTCREATOR_VERSION + +# 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/focal/entrypoint.sh /sbin/entrypoint.sh +ENTRYPOINT ["/sbin/entrypoint.sh"] + +# Qbs build dependencies +RUN apt-get update -qq && \ + DEBIAN_FRONTEND="noninteractive" apt-get install -qq -y --no-install-recommends \ + bison \ + build-essential \ + ca-certificates \ + capnproto \ + ccache \ + clang-8 \ + clang-tidy-8 \ + cmake \ + curl \ + flex \ + git \ + help2man \ + icoutils \ + libcapnp-dev \ + libdbus-1-3 \ + libfreetype6 \ + libfontconfig1 \ + libgl1-mesa-dev \ + libgl1-mesa-glx \ + libnanopb-dev \ + libprotobuf-dev \ + libgrpc++-dev \ + nanopb \ + ninja-build \ + nsis \ + pkg-config \ + protobuf-compiler \ + protobuf-compiler-grpc \ + psmisc \ + python3-pip \ + python3-setuptools \ + p7zip-full \ + subversion \ + unzip \ + zip && \ + update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 && \ + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100 && \ + update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-8 100 && \ + update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \ + update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 100 && \ + pip install beautifulsoup4 lxml protobuf pyyaml + +ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8 + + +# +# Install Qt and Qbs for Linux from qt.io +# +COPY scripts/install-qt.sh install-qt.sh + +RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtscript qttools qtx11extras qtscxml icu && \ + ./install-qt.sh --version ${QTCREATOR_VERSION} qtcreator && \ + echo "export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:/opt/Qt/Tools/QtCreator/bin:\${PATH}" > /etc/profile.d/qt.sh + +ENV PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:/opt/Qt/Tools/QtCreator/bin:${PATH} + + +# Configure Qbs +USER $USER_NAME +RUN qbs-setup-toolchains /usr/bin/g++ gcc && \ + qbs-setup-toolchains /usr/bin/clang clang && \ + qbs-setup-qt /opt/Qt/${QT_VERSION}/gcc_64/bin/qmake qt-gcc_64 && \ + qbs config profiles.qt-gcc_64.baseProfile gcc && \ + qbs-setup-qt /opt/Qt/${QT_VERSION}/gcc_64/bin/qmake qt-clang_64 && \ + qbs config profiles.qt-clang_64.baseProfile clang && \ + qbs config defaultProfile qt-gcc_64 + +# Switch back to root user for the entrypoint script. +USER root + +# Work-around for QTBUG-79020 +RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh diff --git a/docker/focal/test-android.Dockerfile b/docker/focal/test-android.Dockerfile new file mode 100644 index 000000000..a012f504f --- /dev/null +++ b/docker/focal/test-android.Dockerfile @@ -0,0 +1,112 @@ +# +# Android SDK/NDK + Qt for Android for testing Qbs +# +FROM ubuntu:focal +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/focal/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 \ + libasan5 \ + 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 diff --git a/docker/focal/test-baremetal.Dockerfile b/docker/focal/test-baremetal.Dockerfile index d54a87dc2..0265ff135 100644 --- a/docker/focal/test-baremetal.Dockerfile +++ b/docker/focal/test-baremetal.Dockerfile @@ -33,7 +33,7 @@ ENTRYPOINT ["/sbin/entrypoint.sh"] # Install baremetal toolchains and Qbs runtime dependencies. RUN apt-get update -qq && \ apt-get install -qq -y \ - libasan4 \ + libasan5 \ libglib2.0-0 \ libgssapi-krb5-2 \ libgl1-mesa-glx \ -- cgit v1.2.1