From 9d61c5b26cfd11388b2312a4200bcbdf969295d4 Mon Sep 17 00:00:00 2001
From: Chris Rose <cdr@fastmail.fm>
Date: Thu, 22 Sep 2016 14:58:37 +0100
Subject: [PATCH] added readme and fixed some builds

---
 README.md            | 43 +++++++++++++++++++++++++++++++++++++++++++
 centos/5/Dockerfile  |  2 +-
 centos/6/Dockerfile  |  2 +-
 fedora/20/Dockerfile |  4 ++--
 fedora/21/Dockerfile |  4 ++--
 5 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a619f9a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,43 @@
+# FPM (effing package manager) Docker Images
+
+**cdrx/fpm-{$distro}** are a series of Docker images to quickly get packages building in fpm on different Linux distributions. 
+
+Each distro has fpm installed and all the required dependencies to build packages for that platform. All images are 64bit. 
+
+fpm is the entrypoint for the container, so you just need to supply your build options as commands to the container (see examples below). You should mount the files you want to put into your package into `/src/`. 
+
+If you need to do any complicated setup in the environment before running `fpm` then it would be best to write a bash script, mount it into `/src/` and override the containers entrypoint when you run it. `fpm` is available to run in the system path.
+
+## Images
+
+* Ubuntu w/ fpm
+  * `cdrx/fpm-ubuntu:16.04` - xenial
+  * `cdrx/fpm-ubuntu:14.04` - trusty
+
+* Debian w/ fpm
+  * `cdrx/fpm-debian:8`
+  * `cdrx/fpm-debian:7`
+
+* Fedora w/ fpm
+  * `cdrx/fpm-fedora:24`
+  * `cdrx/fpm-fedora:23`
+  * `cdrx/fpm-fedora:22`
+  * `cdrx/fpm-fedora:21`
+  * `cdrx/fpm-fedora:20`
+
+* CentOS w/ fpm
+  * `cdrx/fpm-centos:7`
+  * `cdrx/fpm-centos:6`
+  * `cdrx/fpm-centos:5`
+
+The `:latest` tag will always point to the most recent release of the distro.
+
+## Usage
+
+```
+docker run -v "$(pwd):/src/" cdrx/fpm-ubuntu:16.04 -s dir -t deb ..
+```
+
+```
+docker run -v "$(pwd):/src/" cdrx/fpm-fedora:24 -s dir -t rpm ..
+```
diff --git a/centos/5/Dockerfile b/centos/5/Dockerfile
index 61a6046..a78934f 100644
--- a/centos/5/Dockerfile
+++ b/centos/5/Dockerfile
@@ -6,7 +6,7 @@ RUN chmod +x /tini
 
 RUN set -x \
     && yum install -y ruby-devel rubygems gcc make rpmdevtools \
-    && gem install fpm \
+    && gem install fpm -v 1.4.0 \
     && yum clean all \
     && mkdir /src
 
diff --git a/centos/6/Dockerfile b/centos/6/Dockerfile
index 5aa8bbc..64f7511 100644
--- a/centos/6/Dockerfile
+++ b/centos/6/Dockerfile
@@ -6,7 +6,7 @@ RUN chmod +x /tini
 
 RUN set -x \
     && yum install -y ruby-devel rubygems gcc make rpmdevtools \
-    && gem install fpm \
+    && gem install fpm -v 1.4.0 \
     && yum clean all \
     && mkdir /src
 
diff --git a/fedora/20/Dockerfile b/fedora/20/Dockerfile
index 4276c81..24d7d7a 100644
--- a/fedora/20/Dockerfile
+++ b/fedora/20/Dockerfile
@@ -5,9 +5,9 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 RUN set -x \
-    && dnf install -y ruby-devel gcc make rpmdevtools \
+    && yum install -y ruby-devel gcc make rpmdevtools \
     && gem install fpm \
-    && dnf clean all \
+    && yum clean all \
     && mkdir /src
 
 WORKDIR /src/
diff --git a/fedora/21/Dockerfile b/fedora/21/Dockerfile
index b701790..91b0aeb 100644
--- a/fedora/21/Dockerfile
+++ b/fedora/21/Dockerfile
@@ -5,9 +5,9 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
 RUN set -x \
-    && dnf install -y ruby-devel gcc make rpmdevtools \
+    && yum install -y ruby-devel gcc make rpmdevtools \
     && gem install fpm \
-    && dnf clean all \
+    && yum clean all \
     && mkdir /src
 
 WORKDIR /src/