[jhbuild/ci-ubuntu-20-04] CI: use ubuntu 20.04

[Christoph Reiter <creiter src gnome org>]

commit 02f46953fe325ea58d6e149b873ce1893b998319
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sun Dec 13 11:04:24 2020 +0100

    CI: use ubuntu 20.04
    
    19.04 is gone

 .gitlab-ci.yml             | 6 +++---
 .gitlab-ci/Dockerfile      | 7 +++----
 .gitlab-ci/build-docker.sh | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 344c680c..593c4eb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - deploy
 
 test-py3:
-  image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v4
+  image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v5
   script:
     # autotools install
     - mkdir _build && cd _build
@@ -26,8 +26,8 @@ test-py3:
     paths:
       - public
 
-ub19.04-py3-glib:
-  image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v4
+ub20.04-py3-glib:
+  image: registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v5
   script:
     - ./autogen.sh --with-python=python3
     - make
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index e18a043c..dbe76ba5 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:19.10
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -14,14 +14,13 @@ RUN apt update && apt install -y \
     patch \
     pkg-config \
     python \
-    python-flake8 \
-    python-pytest \
     python3 \
     python3-flake8 \
     python3-pytest \
     sudo \
     trang \
-    yelp-tools
+    yelp-tools \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN useradd -u 1000 -ms /bin/bash user
 RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
diff --git a/.gitlab-ci/build-docker.sh b/.gitlab-ci/build-docker.sh
index 398c79cd..ceae822b 100755
--- a/.gitlab-ci/build-docker.sh
+++ b/.gitlab-ci/build-docker.sh
@@ -2,6 +2,6 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v4"
+TAG="registry.gitlab.gnome.org/gnome/jhbuild/jhbuild:v5"
 
 sudo docker build --tag "${TAG}" --file "Dockerfile" .
\ No newline at end of file