From 9b8b35395d6dfeefd72525a92a8fd6d0fb2844c0 Mon Sep 17 00:00:00 2001
From: "kirby@puppetlabs.com" <mk.kirby@gmail.com>
Date: Thu, 19 Apr 2018 14:21:02 -0700
Subject: [PATCH] Add dockerfile without redis

This commit adds a dockerfile to install vmpooler without a local redis installation. Without this change the dockerfile provided assumes a local redis instance will be running. The dockerfile with redis is retained as 'Dockerfile-aio'. Additionally, the directory '/var/log/vmpooler' is no longer created since vmpooler uses '/var/log/vmpooler.log'.
---
 Dockerfile     |  8 ++------
 Dockerfile-aio | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 Dockerfile-aio

diff --git a/Dockerfile b/Dockerfile
index b2e0ce8..44998af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@
 
 FROM jruby:9.1-jdk
 
-RUN mkdir -p /var/lib/vmpooler && mkdir /var/log/vmpooler
+RUN mkdir -p /var/lib/vmpooler
 
 WORKDIR /var/lib/vmpooler
 
@@ -19,14 +19,10 @@ RUN bundle install --system
 
 RUN ln -s /opt/jruby/bin/jruby /usr/bin/jruby
 
-RUN echo "deb http://httpredir.debian.org/debian jessie main" >/etc/apt/sources.list.d/jessie-main.list
-RUN apt-get update && apt-get install -y redis-server && rm -rf /var/lib/apt/lists/*
-
 COPY . /var/lib/vmpooler
 
 ENV VMPOOLER_LOG /var/log/vmpooler.log
 CMD \
-    /etc/init.d/redis-server start \
-    && /var/lib/vmpooler/scripts/vmpooler_init.sh start \
+    /var/lib/vmpooler/scripts/vmpooler_init.sh start \
     && while [ ! -f ${VMPOOLER_LOG} ]; do sleep 1; done ; \
     tail -f ${VMPOOLER_LOG}
diff --git a/Dockerfile-aio b/Dockerfile-aio
new file mode 100644
index 0000000..ef41405
--- /dev/null
+++ b/Dockerfile-aio
@@ -0,0 +1,32 @@
+# Run vmpooler in a Docker container!  Configuration can either be embedded
+# and built within the current working directory, or stored in a
+# VMPOOLER_CONFIG environment value and passed to the Docker daemon.
+#
+# BUILD:
+#   docker build -t vmpooler .
+#
+# RUN:
+#   docker run -e VMPOOLER_CONFIG -p 80:4567 -it vmpooler
+
+FROM jruby:9.1-jdk
+
+RUN mkdir -p /var/lib/vmpooler
+
+WORKDIR /var/lib/vmpooler
+
+ADD Gemfile* /var/lib/vmpooler/
+RUN bundle install --system
+
+RUN ln -s /opt/jruby/bin/jruby /usr/bin/jruby
+
+RUN echo "deb http://httpredir.debian.org/debian jessie main" >/etc/apt/sources.list.d/jessie-main.list
+RUN apt-get update && apt-get install -y redis-server && rm -rf /var/lib/apt/lists/*
+
+COPY . /var/lib/vmpooler
+
+ENV VMPOOLER_LOG /var/log/vmpooler.log
+CMD \
+    /etc/init.d/redis-server start \
+    && /var/lib/vmpooler/scripts/vmpooler_init.sh start \
+    && while [ ! -f ${VMPOOLER_LOG} ]; do sleep 1; done ; \
+    tail -f ${VMPOOLER_LOG}