diff options
| author | hjk <hjk@qt.io> | 2021-08-31 16:15:40 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-09-08 14:26:37 +0000 |
| commit | adae66455d57fea06577f44cdf0cdc1406d085f2 (patch) | |
| tree | ca543eb8e8839f9ada2be512bddddb16257c2fa2 /tests/manual/docker | |
| parent | 152fdd35f55e30f5de4fe650f4e9917c39b4df13 (diff) | |
Docker: Use current cmake in test Dockerfile
Change-Id: Icf9c116a72e679223aaa9a3f545fb0f7db5a31d4
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
Diffstat (limited to 'tests/manual/docker')
| -rw-r--r-- | tests/manual/docker/Dockerfile-qt-5-ubuntu-20.04-build | 15 |
1 files 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 ce6d84259c..be10684ac3 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 \ |