[gtk/doc-chapters-markdown: 28/29] ci: Add a fedora-docs image
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/doc-chapters-markdown: 28/29] ci: Add a fedora-docs image
- Date: Mon, 25 May 2020 20:14:45 +0000 (UTC)
commit f60149cd9e060650edbb1a487499c1fb44267367
Author: Matthias Clasen <mclasen redhat com>
Date: Mon May 25 12:45:29 2020 -0400
ci: Add a fedora-docs image
Split the fedora image into fedora-base (containing just
the packages) and fedora (adding the user setup), and add
a fedora-docs image that is adding pandoc on top of the
fedora-base image.
.gitlab-ci/fedora-base.Dockerfile | 88 +++++++++++++++++++++++++++++++++++++++
.gitlab-ci/fedora-docs.Dockerfile | 12 ++++++
.gitlab-ci/fedora.Dockerfile | 88 +--------------------------------------
3 files changed, 101 insertions(+), 87 deletions(-)
---
diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile
new file mode 100644
index 0000000000..0237b3804b
--- /dev/null
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -0,0 +1,88 @@
+FROM fedora:31
+
+RUN dnf -y install \
+ adwaita-icon-theme \
+ atk-devel \
+ at-spi2-atk-devel \
+ avahi-gobject-devel \
+ cairo-devel \
+ cairo-gobject-devel \
+ ccache \
+ clang \
+ clang-analyzer \
+ colord-devel \
+ cups-devel \
+ dbus-daemon \
+ dbus-x11 \
+ dejavu-sans-mono-fonts \
+ desktop-file-utils \
+ diffutils \
+ elfutils-libelf-devel \
+ fribidi-devel \
+ gcc \
+ gcc-c++ \
+ gdk-pixbuf2-devel \
+ gdk-pixbuf2-modules \
+ gettext \
+ git \
+ glib2-devel \
+ glib2-static \
+ glibc-devel \
+ glibc-headers \
+ gobject-introspection-devel \
+ graphene-devel \
+ gstreamer1-devel \
+ gstreamer1-plugins-good \
+ gstreamer1-plugins-bad-free-devel \
+ gstreamer1-plugins-base-devel \
+ gtk-doc \
+ hicolor-icon-theme \
+ iso-codes \
+ itstool \
+ json-glib-devel \
+ lcov \
+ libattr-devel \
+ libepoxy-devel \
+ libffi-devel \
+ libmount-devel \
+ librsvg2 \
+ libselinux-devel \
+ libXcomposite-devel \
+ libXcursor-devel \
+ libXcursor-devel \
+ libXdamage-devel \
+ libXfixes-devel \
+ libXi-devel \
+ libXinerama-devel \
+ libxkbcommon-devel \
+ libXrandr-devel \
+ libXrender-devel \
+ libXtst-devel \
+ libxslt \
+ mesa-dri-drivers \
+ mesa-libEGL-devel \
+ mesa-libwayland-egl-devel \
+ ninja-build \
+ pango-devel \
+ pcre-devel \
+ pcre-static \
+ python3 \
+ python3-jinja2 \
+ python3-pip \
+ python3-pygments \
+ python3-wheel \
+ redhat-rpm-config \
+ sassc \
+ sysprof-devel \
+ systemtap-sdt-devel \
+ vulkan-devel \
+ wayland-devel \
+ wayland-protocols-devel \
+ weston \
+ weston-libs \
+ which \
+ xorg-x11-server-Xvfb \
+ && dnf clean all
+
+RUN pip3 install meson==0.53.1
+
diff --git a/.gitlab-ci/fedora-docs.Dockerfile b/.gitlab-ci/fedora-docs.Dockerfile
new file mode 100644
index 0000000000..a99a15e6c2
--- /dev/null
+++ b/.gitlab-ci/fedora-docs.Dockerfile
@@ -0,0 +1,12 @@
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
+
+RUN dnf -y install pandoc
+
+ARG HOST_USER_ID=5555
+ENV HOST_USER_ID ${HOST_USER_ID}
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+
+USER user
+WORKDIR /home/user
+
+ENV LANG C.UTF-8
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 217dd45a98..95e2bdf727 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,90 +1,4 @@
-FROM fedora:31
-
-RUN dnf -y install \
- adwaita-icon-theme \
- atk-devel \
- at-spi2-atk-devel \
- avahi-gobject-devel \
- cairo-devel \
- cairo-gobject-devel \
- ccache \
- clang \
- clang-analyzer \
- colord-devel \
- cups-devel \
- dbus-daemon \
- dbus-x11 \
- dejavu-sans-mono-fonts \
- desktop-file-utils \
- diffutils \
- elfutils-libelf-devel \
- fribidi-devel \
- gcc \
- gcc-c++ \
- gdk-pixbuf2-devel \
- gdk-pixbuf2-modules \
- gettext \
- git \
- glib2-devel \
- glib2-static \
- glibc-devel \
- glibc-headers \
- gobject-introspection-devel \
- graphene-devel \
- gstreamer1-devel \
- gstreamer1-plugins-good \
- gstreamer1-plugins-bad-free-devel \
- gstreamer1-plugins-base-devel \
- gtk-doc \
- hicolor-icon-theme \
- iso-codes \
- itstool \
- json-glib-devel \
- lcov \
- libattr-devel \
- libepoxy-devel \
- libffi-devel \
- libmount-devel \
- librsvg2 \
- libselinux-devel \
- libXcomposite-devel \
- libXcursor-devel \
- libXcursor-devel \
- libXdamage-devel \
- libXfixes-devel \
- libXi-devel \
- libXinerama-devel \
- libxkbcommon-devel \
- libXrandr-devel \
- libXrender-devel \
- libXtst-devel \
- libxslt \
- mesa-dri-drivers \
- mesa-libEGL-devel \
- mesa-libwayland-egl-devel \
- ninja-build \
- pango-devel \
- pcre-devel \
- pcre-static \
- python3 \
- python3-jinja2 \
- python3-pip \
- python3-pygments \
- python3-wheel \
- redhat-rpm-config \
- sassc \
- sysprof-devel \
- systemtap-sdt-devel \
- vulkan-devel \
- wayland-devel \
- wayland-protocols-devel \
- weston \
- weston-libs \
- which \
- xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson==0.53.1
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]