diff options
| -rw-r--r-- | docker-compose.yml | 4 | ||||
| -rw-r--r-- | docker/bionic/test-android.Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index ea4a8c5a1..6ca7a3046 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: bionic-android-513: << : *linux hostname: bionic-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-1 build: dockerfile: docker/bionic/test-android.Dockerfile context: . @@ -36,7 +36,7 @@ services: bionic-android-514: << : *linux hostname: bionic-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-1 build: dockerfile: docker/bionic/test-android.Dockerfile context: . diff --git a/docker/bionic/test-android.Dockerfile b/docker/bionic/test-android.Dockerfile index ea7fde7a0..854c67a19 100644 --- a/docker/bionic/test-android.Dockerfile +++ b/docker/bionic/test-android.Dockerfile @@ -36,6 +36,7 @@ RUN apt-get update -qq && \ ca-certificates \ curl \ libglib2.0-0 \ + libgl1-mesa-glx \ openjdk-8-jdk-headless \ p7zip-full \ unzip @@ -104,4 +105,3 @@ RUN if [ "${QT_VERSION}" \< "5.14" ]; then \ ./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 - |