[libsoup/wip/ci/fedora36: 1/2] ci: Update to Fedora 36

[Patrick Griffis <pgriffis src gnome org>]

commit a3741a472337dea80aa8b9e76436597b08dbe6a0
Author: Patrick Griffis <pgriffis igalia com>
Date:   Thu Oct 6 13:18:08 2022 -0500

    ci: Update to Fedora 36

 .gitlab-ci.yml           |  2 +-
 .gitlab-ci/Dockerfile    | 53 ++++++++----------------------------------------
 .gitlab-ci/run-docker.sh |  2 +-
 3 files changed, 10 insertions(+), 47 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c6d3209..f67d5160 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/libsoup/master:v17
+image: registry.gitlab.gnome.org/gnome/libsoup/master:v18
 
 stages:
   - build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 1a735977..67cc0e69 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,24 +1,24 @@
-FROM fedora:34
+FROM fedora:36
 
+# NOTE: We set tsflags to empty so docs actually install...
 RUN dnf update -y \
-    && dnf install -y \
-                      autoconf-archive \
+    && dnf install --setopt=tsflags='' -y \
                       brotli-devel \
                       clang-analyzer \
                       'dnf-command(builddep)' \
                       git \
+                      gi-docgen \
                       glib2-doc \
                       gnutls-devel \
                       gobject-introspection-devel \
-                      gtk-doc \
                       httpd \
                       krb5-devel \
                       lcov \
                       libasan \
-                      libpsl-devel \
                       libnghttp2-devel \
+                      libpsl-devel \
+                      libsoup-doc \
                       lsof \
-                      make \
                       meson \
                       mod_ssl \
                       python2.7 \
@@ -29,47 +29,10 @@ RUN dnf update -y \
                       vala \
                       valgrind \
                       which \
-    && dnf builddep -y glib2 nghttp2 vala \
+    && dnf builddep -y nghttp2 \
     && dnf clean all \
     && python2.7 -m ensurepip \
-    && pip2.7 install virtualenv autobahntestsuite \
-    && pip3 install gi-docgen
-
-# We need glib 2.70
-RUN git clone https://gitlab.gnome.org/GNOME/glib.git \
-    && pushd glib \
-    && git checkout 2.69.1 \
-    && meson _build --prefix=/usr -Dgtk_doc=true \
-    && ninja -C _build install \
-    && popd \
-    && rm -rf glib
-
-RUN git clone https://gitlab.gnome.org/GNOME/glib-networking.git \
-    && pushd glib-networking \
-    && git checkout f7b3250d3e3fce4ea02b00610d9f2148ade4a6ce \
-    && meson _build --prefix=/usr \
-    && ninja -C _build install \
-    && popd \
-    && rm -rf glib-networking
-
-# Fedora 34 has a really outdated vala
-RUN git clone https://gitlab.gnome.org/GNOME/vala.git \
-    && pushd vala \
-    && git checkout 0.50.10 \
-    && ./autogen.sh --prefix=/usr \
-    && make install \
-    && popd \
-    && rm -rf vala
-
-# We install the docs for libsoup2 to host (idk why libsoup-docs package doesn't work)
-RUN git clone https://gitlab.gnome.org/GNOME/libsoup.git \
-    && pushd libsoup \
-    && git checkout libsoup-2-74 \
-    && meson _build --prefix=/usr -Dgtk_doc=true \
-    && ninja -C _build libsoup-2.4-doc \
-    && cp -R _build/docs/reference/html /usr/share/gtk-doc/html/libsoup-2.4 \
-    && popd \
-    && rm -rf libsoup
+    && pip2.7 install virtualenv autobahntestsuite
 
 # Update libnghttp2 for do_invalid_header_rfc9113_received_test()
 RUN git clone https://github.com/nghttp2/nghttp2.git \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index e06091f6..4e150f11 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v17"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v18"
 
 SUDO_CMD="sudo"
 if docker -v |& grep -q podman; then