[libadwaita/wip/exalm/bump-gtk: 1/4] ci: Base the docs image on f35




commit 29587bf806061679f1ca44511842cae5d57557bb
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Aug 31 12:22:36 2021 +0500

    ci: Base the docs image on f35
    
    We need newer GTK than f34 has.
    
    Trim down the packages as well, it still had all the gtk-doc deps.
    
    Bump the tag to v2.

 .gitlab-ci.yml             |  2 +-
 .gitlab-ci/docs.Dockerfile | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e8199d7..38d9b403 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   FLATPAK_MODULE: 'libadwaita'
   FLATPAK_BUILD_DIR: build
   ABI_CHECKER_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/abi-checker:v1"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/docs:v1"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/libadwaita/docs:v2"
 
 stages:
   - build
diff --git a/.gitlab-ci/docs.Dockerfile b/.gitlab-ci/docs.Dockerfile
index b46ddb1a..63415daf 100644
--- a/.gitlab-ci/docs.Dockerfile
+++ b/.gitlab-ci/docs.Dockerfile
@@ -1,23 +1,17 @@
-FROM fedora:34
+FROM fedora:35
 
 RUN dnf -y update \
  && dnf -y install \
-    @development-tools \
-    dnf-plugins-core \
     gcc \
     git \
+    glib2-devel \
     gobject-introspection-devel \
     gtk4-devel \
-    meson \
-    pcre-static \
-    python3 \
     python3-jinja2 \
     python3-markdown \
-    python3-pip \
     python3-pygments \
     python3-toml \
     python3-typogrify \
-    python3-wheel \
-    redhat-rpm-config \
+    meson \
     sassc \
  && dnf clean all


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]