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-compose.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index 5d7c227c1..d69776c67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,33 +17,33 @@ x-default-service: &linux - SYS_PTRACE services: - bionic: + focal: << : *linux - hostname: bionic - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.15.0_1.15.1-2 + hostname: focal + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.0_1.15.1-0 build: - dockerfile: docker/bionic/Dockerfile + dockerfile: docker/focal/Dockerfile context: . args: QT_VERSION: 5.15.0 QTCREATOR_VERSION: 4.11.2 - bionic-android-513: + focal-android-513: << : *linux - hostname: bionic-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.13.2-4 + hostname: focal-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.13.2-0 build: - dockerfile: docker/bionic/test-android.Dockerfile + dockerfile: docker/focal/test-android.Dockerfile context: . args: QT_VERSION: 5.13.2 - bionic-android-514: + focal-android-514: << : *linux - hostname: bionic-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-android-5.14.0-4 + hostname: focal-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.14.0-0 build: - dockerfile: docker/bionic/test-android.Dockerfile + dockerfile: docker/focal/test-android.Dockerfile context: . args: QT_VERSION: 5.14.0 @@ -51,7 +51,7 @@ services: focal-baremetal: << : *linux hostname: focal-baremetal - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-1 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-2 build: dockerfile: docker/focal/test-baremetal.Dockerfile context: . -- cgit v1.2.3