From 86206f0576c97afc2f7344bf3ade23085d83db22 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Oct 29 2021 13:30:51 +0000
Subject: [PATCH 1/2] Dockerfile: alphabetize list of rpm deps


---

diff --git a/Dockerfile b/Dockerfile
index a2b59aa..d043587 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,15 +4,15 @@ FROM registry.fedoraproject.org/fedora:35
 RUN dnf update -y
 
 # Install necessary (fedmsg/koji/s3fs/createrepo/fedora-repo-zdicts) binaries/libraries
-RUN dnf -y install dnf-plugins-core \
-                   findutils        \
-                   fedora-messaging \
-                   koji             \
-                   awscli           \
-                   s3fs-fuse        \
-                   rsync            \
-                   createrepo_c     \
-                   fedora-repo-zdicts
+RUN dnf -y install awscli             \
+                   createrepo_c       \
+                   dnf-plugins-core   \
+                   fedora-messaging   \
+                   fedora-repo-zdicts \
+                   findutils          \
+                   koji               \
+                   rsync              \
+                   s3fs-fuse
 
 # Copy the fedora config for fedora-messaging and also generate a random UUID
 # https://fedora-messaging.readthedocs.io/en/latest/fedora-broker.html#getting-connected

From 4d2e404c87a86025b7161d841178488b6db7f7cb Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Oct 29 2021 13:31:56 +0000
Subject: [PATCH 2/2] Dockerfile: name util-linux as a dependency


It provides `unshare` and is no longer included in the base image so
we need to name the dependency here.

---

diff --git a/Dockerfile b/Dockerfile
index d043587..11bacb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM registry.fedoraproject.org/fedora:35
 RUN dnf update -y
 
 # Install necessary (fedmsg/koji/s3fs/createrepo/fedora-repo-zdicts) binaries/libraries
+# util-linux is needed for `unshare`
 RUN dnf -y install awscli             \
                    createrepo_c       \
                    dnf-plugins-core   \
@@ -12,7 +13,8 @@ RUN dnf -y install awscli             \
                    findutils          \
                    koji               \
                    rsync              \
-                   s3fs-fuse
+                   s3fs-fuse          \
+                   util-linux
 
 # Copy the fedora config for fedora-messaging and also generate a random UUID
 # https://fedora-messaging.readthedocs.io/en/latest/fedora-broker.html#getting-connected