From 92dcda11cc01927580eb6d9818818bc673206617 Mon Sep 17 00:00:00 2001
From: Richard Weickelt <richard@weickelt.de>
Date: Sat, 21 Sep 2019 14:27:41 +0200
Subject: Bump Qt version to 5.12.5 for automated builds

Also introduce accurate versioning for docker images. This
makes it possible to use different build environments in
different branches.

Change-Id: I4feb83dbba886c4369d661ec746428b0c89b80b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index cdfa6ee55..16d9e361a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,12 +12,12 @@ services:
   bionic:
     << : *linux
     hostname: bionic
-    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic
+    image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-1
     build:
       dockerfile: docker/bionic/Dockerfile
       context: .
       args:
-        QT_VERSION: 5.12.4
+        QT_VERSION: 5.12.5
         QTCREATOR_VERSION: 4.9.2
 
   stretch:
-- 
cgit v1.2.3