From 23f09aff001a0a96a24ae0c338b5e07dd000bc73 Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@hashbangbash.com>
Date: Thu, 11 Jun 2015 10:49:40 -0400
Subject: [PATCH] fedora-dev: switch to dnf

---
 fedora-dev/Dockerfile.in      | 16 ++++++++--------
 fedora-dev/Dockerfile.rawhide | 31 -------------------------------
 2 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 fedora-dev/Dockerfile.rawhide

diff --git a/fedora-dev/Dockerfile.in b/fedora-dev/Dockerfile.in
index c10fd48..2df3a13 100644
--- a/fedora-dev/Dockerfile.in
+++ b/fedora-dev/Dockerfile.in
@@ -1,10 +1,10 @@
 FROM FROM_IMAGE
 
-RUN yum erase -y vim-minimal && \
-	groupadd -g 990 docker && \
-	yum groupinstall -y "development tools" && \
-	yum install -y --setopt=override_install_langs=en --setopt=tsflags=nodocs \
-	yum-utils \
+RUN dnf erase -y vim-minimal
+RUN groupadd -g 990 docker
+RUN dnf groupinstall -y "development tools"
+RUN dnf install -y --setopt=override_install_langs=en --setopt=tsflags=nodocs \
+	dnf-plugins-core \
 	git \
 	golang \
 	mercurial \
@@ -31,9 +31,9 @@ RUN yum erase -y vim-minimal && \
 	dbus-devel \
 	keychain \
 	tito && \
-	yum update -y && \
-	yum clean all && \
-	groupadd -g DEV_GID DEV_USER && \
+	dnf update -y && \
+	dnf clean all
+RUN groupadd -g DEV_GID DEV_USER && \
 	useradd -m -u DEV_UID -g DEV_GID -G wheel,mock DEV_USER && \
 	sed -ri 's/^(%wheel.*)(ALL)$/\1NOPASSWD: \2/' /etc/sudoers
 USER DEV_USER
diff --git a/fedora-dev/Dockerfile.rawhide b/fedora-dev/Dockerfile.rawhide
deleted file mode 100644
index 18854a3..0000000
--- a/fedora-dev/Dockerfile.rawhide
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM fedora:rawhide
-
-RUN yum erase -y vim-minimal &&\
-	yum groupinstall -y "development tools" && \
-	yum install -y --setopt=override_install_langs=en --setopt=tsflags=nodocs \
-	yum-utils \
-	git \
-	golang \
-	mercurial \
-	bzr \
-	vim-enhanced \
-	fedora-packager \
-	sudo \
-	screen \
-	libtool \
-	gtk-doc \
-	intltool \
-	libgcrypt-devel \
-	gperf \
-	libcap-devel \
-	glib2-devel \
-	keychain \
-	tito && \
-	yum update -y && \
-	yum clean all && \
-	useradd -m -u 1000 -G wheel,mock vbatts && \
-	sed -ri 's/^(%wheel.*)(ALL)$/\1NOPASSWD: \2/' /etc/sudoers
-USER vbatts
-ENV HOME /home/vbatts
-WORKDIR /home/vbatts
-CMD bash -l