From adae66455d57fea06577f44cdf0cdc1406d085f2 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 31 Aug 2021 16:15:40 +0200 Subject: [PATCH] Docker: Use current cmake in test Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icf9c116a72e679223aaa9a3f545fb0f7db5a31d4 Reviewed-by: Pasi Petäjäjärvi --- .../docker/Dockerfile-qt-5-ubuntu-20.04-build | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build index ce6d84259ca..be10684ac3f 100644 --- a/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build +++ b/tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build @@ -1,13 +1,22 @@ FROM ubuntu:20.04 -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ +RUN apt update && \ + apt upgrade -y && \ + apt dist-upgrade -y && \ + apt install -y gpg wget software-properties-common + +RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \ + | gpg --dearmor - \ + | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null + +RUN apt-add-repository -y 'deb https://apt.kitware.com/ubuntu/ focal main' + +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ git \ openssh-client \ sudo \ vim \ - wget \ cmake \ qtbase5-dev \ libqt5core5a \