[evince/wip/gpoo/update-registry-image-files] ci: Update versions for gitlab-ci's Docker image

[Germán Poo-Caamaño <gpoo src gnome org>]

commit afe7723eccd7a3d4cd1fb585dbc1b4ad445c9ca2
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Wed Aug 24 21:09:30 2022 -0400

    ci: Update versions for gitlab-ci's Docker image
    
    * Upgrade image to Ubuntu 22.04
    * Update poppler to latest stable release (22.07)
    * Use packages for libarchive (3.6.0), hence we do not need to build
      it anymore.

 .gitlab-ci/setup-ubuntu.sh   | 17 +++++------------
 .gitlab-ci/ubuntu.Dockerfile |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci/setup-ubuntu.sh b/.gitlab-ci/setup-ubuntu.sh
index 0a88e549b..4f2a8f980 100644
--- a/.gitlab-ci/setup-ubuntu.sh
+++ b/.gitlab-ci/setup-ubuntu.sh
@@ -14,11 +14,13 @@ apt-get -yqq install --no-install-recommends \
     libgirepository1.0-dev libgtk-3-dev \
     libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
     libxml2-dev libxml2-utils \
+    libarchive-dev \
     libsecret-1-dev libgspell-1-dev \
     libgnome-desktop-3-dev libnautilus-extension-dev \
     libspectre-dev libtiff5-dev libdjvulibre-dev \
     libkpathsea-dev libgxps-dev libsynctex-dev \
-    git ccache systemd ninja-build meson
+    git ccache systemd ninja-build meson \
+    cmake
 
 # Install gi-docgen and its dependencies
 apt-get -yqq install --no-install-recommends \
@@ -26,20 +28,11 @@ apt-get -yqq install --no-install-recommends \
 
 pip install gi-docgen
 
-# Install dependencies to build libarchive
-apt-get -yqq install --no-install-recommends \
-    cmake liblz4-dev libzstd-dev libb2-dev libssl-dev
-
 # Install dependencies to build poppler
 apt-get -yqq install --no-install-recommends \
     poppler-data libboost-container-dev libopenjp2-7-dev libcurl4-openssl-dev
 
-git clone --depth 1 --branch v3.6.0 \
-    https://github.com/libarchive/libarchive.git /tmp/libarchive
-cd /tmp/libarchive
-cmake .; make --silent -j4; make install
-
-git clone --depth 1 --branch poppler-22.02.0 \
+git clone --depth 1 --branch poppler-22.07.0 \
     https://gitlab.freedesktop.org/poppler/poppler.git /tmp/poppler
 cd /tmp/poppler
 cmake -DBUILD_GTK_TESTS=OFF, -DBUILD_CPP_TESTS=OFF, -DENABLE_UTILS=OFF, \
@@ -50,6 +43,6 @@ ninja && ninja install
 
 # Clean up
 apt-get clean
-rm -rf /tmp/libarchive /tmp/poppler
+rm -rf /tmp/poppler
 
 useradd -u 1984 -ms /bin/sh user
diff --git a/.gitlab-ci/ubuntu.Dockerfile b/.gitlab-ci/ubuntu.Dockerfile
index fdc6457b2..23e4d11e6 100644
--- a/.gitlab-ci/ubuntu.Dockerfile
+++ b/.gitlab-ci/ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.10
+FROM ubuntu:22.04
 
 ENV LANG C.UTF-8