[evince/wip/gpoo/image-rebuild] Update instructions

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

commit a903b3b6ac844a88cd5b7aadc32e515b078c0ff4
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Wed Aug 31 01:09:03 2022 -0400

    Update instructions

 .gitlab-ci.yml               |  7 ++++---
 .gitlab-ci/ci.Dockerfile     |  9 +++++++++
 .gitlab-ci/setup-ubuntu.sh   |  7 +++----
 .gitlab-ci/ubuntu.Dockerfile | 36 +++---------------------------------
 4 files changed, 19 insertions(+), 40 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f4569c33..6c51d9c29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,6 +77,7 @@ update image:
     image: alpine:latest
     stage: image
     script:
+        - buildah add .gitlab-ci/setup-ubuntu.sh /opt/setup-ubuntu.sh
         - apk add --no-cache buildah runc
         - buildah bud --tag $IMAGE_TAG -f .gitlab-ci/ubuntu.Dockerfile
         - buildah tag $IMAGE_TAG "$IMAGE_TAG:v$CI_JOB_ID"
@@ -84,9 +85,9 @@ update image:
         - buildah push --creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD $IMAGE_TAG
         - buildah push --creds $CI_REGISTRY_USER:$CI_REGISTRY_PASSWORD "$IMAGE_TAG:v$CI_JOB_ID"
     when: manual
-    only:
-       - web
-       - main
+    #only:
+    #   - web
+    #   - main
     except:
        variables:
            - $CI_PROJECT_NAMESPACE != "GNOME"
diff --git a/.gitlab-ci/ci.Dockerfile b/.gitlab-ci/ci.Dockerfile
new file mode 100644
index 000000000..2b36f6e95
--- /dev/null
+++ b/.gitlab-ci/ci.Dockerfile
@@ -0,0 +1,9 @@
+FROM alpine:3.16
+
+ENV DOCKER_TLS_CERTDIR="/certs" STORAGE_DRIVER=vfs BUILDAH_FORMAT=docker        BUILDAH_ISOLATION=chroot
+
+ADD ubuntu.Dockerfile /opt/
+ADD setup-ubuntu.sh /opt/
+
+RUN apk add --no-cache buildah runc \
+&& buildah bud --tag registry.gitlab.gnome.org/gnome/evince/x86_64-ubuntu -f /opt/ubuntu.Dockerfile
diff --git a/.gitlab-ci/setup-ubuntu.sh b/.gitlab-ci/setup-ubuntu.sh
index 4f2a8f980..9b37a7c43 100644
--- a/.gitlab-ci/setup-ubuntu.sh
+++ b/.gitlab-ci/setup-ubuntu.sh
@@ -22,11 +22,10 @@ apt-get -yqq install --no-install-recommends \
     git ccache systemd ninja-build meson \
     cmake
 
-# Install gi-docgen and its dependencies
+# Install dependencies to build gi-docgen
 apt-get -yqq install --no-install-recommends \
-    python3-pip python3-jinja2 python3-toml python3-typogrify
-
-pip install gi-docgen
+    python3-jinja2 python3-pygments python3-markupsafe \
+    python3-markdown python3-toml python3-typogrify
 
 # Install dependencies to build poppler
 apt-get -yqq install --no-install-recommends \
diff --git a/.gitlab-ci/ubuntu.Dockerfile b/.gitlab-ci/ubuntu.Dockerfile
index edad215d2..4ed22a016 100644
--- a/.gitlab-ci/ubuntu.Dockerfile
+++ b/.gitlab-ci/ubuntu.Dockerfile
@@ -1,39 +1,9 @@
 FROM ubuntu:22.04
 
-ENV LANG=C.UTF-8 DEBIAN_FRONTEND=noninteractive
+ENV LANG=C.UTF-8
 
-RUN apt-get -yqq update \
-&& apt-get -yqq install --no-install-recommends \
-    apt-utils \
-&& apt-get -yqq install --no-install-recommends \
-    gnome-common libglib2.0-dev-bin \
-    yelp-tools itstool appstream \
-    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 \
-    cmake \
-&& apt-get -yqq install --no-install-recommends \
-    python3-pip python3-jinja2 python3-toml python3-typogrify \
-&& pip install gi-docgen \
-&& apt-get -yqq install --no-install-recommends \
-    poppler-data libboost-container-dev libopenjp2-7-dev libcurl4-openssl-dev \
-&& 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, \
-    -DENABLE_CPP=OFF, -DENABLE_GOBJECT_INTROSPECTION=OFF, \
-    -DENABLE_LIBOPENJPEG=openjpeg2 -DENABLE_QT5=OFF -DENABLE_QT6=OFF \
-    -DBUILD_GTK_TESTS=OFF -DBUILD_CPP_TESTS=OFF -G Ninja . \
-&& ninja && ninja install \
-&& apt-get clean \
-&& rm -rf /tmp/poppler \
-&& useradd -u 1984 -ms /bin/sh user
+ADD /opt/setup-ubuntu.sh /opt/
+RUN /bin/sh /opt/setup-ubuntu.sh
 
 USER user
 WORKDIR /home/user