From 208f562c8e30072c121382f0debd158985546947 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 12 Dec 2016 17:27:19 +0100
Subject: [PATCH] CI: Pick up build requirements from rpm

---
 .redhat-ci.Dockerfile | 24 ------------------------
 .redhat-ci.yml        | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 25 deletions(-)
 delete mode 100644 .redhat-ci.Dockerfile

diff --git a/.redhat-ci.Dockerfile b/.redhat-ci.Dockerfile
deleted file mode 100644
index 9af0b3cc..00000000
--- a/.redhat-ci.Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM fedora:25
-MAINTAINER Alexander Larsson <alexl@redhat.com>
-
-RUN dnf install -y \
-        gcc \
-        sudo \
-        which \
-        attr \
-        fuse \
-        gjs \
-        parallel \
-        clang \
-        libubsan \
-        gnome-desktop-testing \
-        redhat-rpm-config \
-        elfutils \
-        ostree-devel \
-        libarchive-devel \
-        json-glib-devel \
-        fuse-devel \
- && dnf clean all
-
-# create an unprivileged user for testing
-RUN adduser testuser
diff --git a/.redhat-ci.yml b/.redhat-ci.yml
index 9a3f4237..eaebe1bd 100644
--- a/.redhat-ci.yml
+++ b/.redhat-ci.yml
@@ -4,7 +4,42 @@ branches:
     - try
 
 container:
-    image: projectatomic/ostree-tester
+    image: fedora:25
+
+packages:
+    - gcc
+    - sudo
+    - which
+    - attr
+    - fuse
+    - gjs
+    - parallel
+    - clang
+    - libubsan
+    - gnome-desktop-testing
+    - pkgconfig(fuse)
+    - pkgconfig(gio-unix-2.0)
+    - pkgconfig(gobject-introspection-1.0) >= 1.40.0
+    - pkgconfig(json-glib-1.0)
+    - pkgconfig(libarchive) >= 2.8.0
+    - pkgconfig(libelf) >= 0.8.12
+    - pkgconfig(libsoup-2.4)
+    - pkgconfig(ostree-1) >= %{ostree_version}
+    - pkgconfig(polkit-gobject-1)
+    - pkgconfig(libseccomp)
+    - pkgconfig(xau)
+    - bubblewrap >= %{bubblewrap_version}
+    - docbook-dtds
+    - docbook-style-xsl
+    - intltool
+    - libattr-devel
+    - libcap-devel
+    - libdwarf-devel
+    - elfutils
+    - systemd
+    - /usr/bin/xmlto
+    - /usr/bin/xsltproc
+    - redhat-rpm-config
 
 env:
     CFLAGS: '-fsanitize=undefined'