From e48dba2ba0f223f47c854caedaeb7037d7533f80 Mon Sep 17 00:00:00 2001 From: Gennady Pospelov <g.pospelov@fz-juelich.de> Date: Wed, 6 May 2020 14:06:54 +0200 Subject: [PATCH] Switch Travis to the new Docker custom ubuntu-focal container. Goal is to have latest Qt and lates cmake, and decrease "install" time. --- .travis/linux/Dockerfile | 4 +--- .travis/linux/install.sh | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis/linux/Dockerfile b/.travis/linux/Dockerfile index c25128e627e..5d53e03f7cb 100644 --- a/.travis/linux/Dockerfile +++ b/.travis/linux/Dockerfile @@ -1,5 +1,3 @@ -FROM scgmlz/bornagain-dev:xenial -RUN apt install libqt5svg5-dev - +FROM scgmlz/bornagain-dev:focal ADD . /source WORKDIR /source diff --git a/.travis/linux/install.sh b/.travis/linux/install.sh index 4e8a6c3da36..a20e9192f47 100644 --- a/.travis/linux/install.sh +++ b/.travis/linux/install.sh @@ -1,3 +1,3 @@ -docker build -t bornagain/wily -f `dirname $0`/Dockerfile . -docker run -d --name dd -it bornagain/wily +docker build -t bornagain/focal -f `dirname $0`/Dockerfile . +docker run -d --name dd -it bornagain/focal docker ps -a -- GitLab