From 28cfd156f9ad154451523ddee4625e97159080ed Mon Sep 17 00:00:00 2001
From: Michael Kefeder <mike@multiwave.ch>
Date: Wed, 25 May 2016 18:52:18 +0200
Subject: [PATCH 1/5] only use REDIS_URL environment variable, easier to use

---
 qless.ru | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/qless.ru b/qless.ru
index bac7a42..6618757 100644
--- a/qless.ru
+++ b/qless.ru
@@ -1,7 +1,8 @@
 require 'qless'
 require 'qless/server'
 
-client = Qless::Client.new(:host => ENV['REDIS_HOST'], :port => ENV['REDIS_PORT'].to_i, :db => ENV['DB_NUM'].to_i )
+# use REDIS_URL="redis://some-host:7000/3"
+client = Qless::Client.new
 
 QlessServer = Rack::Builder.app do
   if ENV['QLESS_BASIC_AUTH_USER'] && ENV['QLESS_BASIC_AUTH_PASSWORD']
@@ -10,7 +11,12 @@ QlessServer = Rack::Builder.app do
     end
   end
 
-  map(ENV['HTTP_PATH']) { run Qless::Server.new(client) }
+  gui_path = '/qless'
+  if ENV['HTTP_PATH']
+    gui_path = ENV['HTTP_PATH']
+  end
+
+  map(gui_path) { run Qless::Server.new(client) }
 end
 
 run QlessServer

From b1dd846d25dfd79d96c409e96fb0e130740a55ef Mon Sep 17 00:00:00 2001
From: Michael Kefeder <mike@multiwave.ch>
Date: Wed, 25 May 2016 18:52:48 +0200
Subject: [PATCH 2/5] based on debian for smaller docker image, no ppa needed,
 patch to load jquery from local file not from CDN

---
 Dockerfile     | 22 +++++++++++++---------
 local_js.patch | 13 +++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 local_js.patch

diff --git a/Dockerfile b/Dockerfile
index f316955..50c4cad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ubuntu:14.04
+# direct debian works too but is bigger by 40MiB
+#FROM debian:jessie
+FROM philcryer/min-jessie
 
 # Prevent docker's default encoding of ASCII.
 # # https://oncletom.io/2015/docker-encoding/
@@ -6,17 +8,19 @@ ENV LANG C.UTF-8
 ENV LANGUAGE en_US:C
 ENV LC_ALL C.UTF-8
 
-# PPA for Ruby 2.1
-RUN apt-get update
-RUN apt-get install -y python3-software-properties software-properties-common
-RUN add-apt-repository ppa:chris-lea/redis-server
-RUN apt-add-repository ppa:brightbox/ruby-ng
-RUN apt-get update
-RUN apt-get install -y ruby2.1 redis-tools git
+RUN  echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list && \
+ apt-get update && \
+ apt-get install -y ruby2.1 git curl && \
+ apt-get install -t jessie-backports -y redis-tools && \
+ rm -rf /var/lib/apt/lists/*
 
-RUN gem install bundler
+RUN gem2.1 install bundler
 
 ADD . /qless
 WORKDIR /qless
 
 RUN bundle install
+
+# make jquery local
+RUN curl -o "$(find /var/lib/gems/ -wholename */lib/qless/server/static/js -type d)/jquery.min.js" https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js && \
+  patch -d "$(find /var/lib/gems/ -wholename */lib/qless/server -type d)" -p4 < /qless/local_js.patch
diff --git a/local_js.patch b/local_js.patch
new file mode 100644
index 0000000..2e8b18d
--- /dev/null
+++ b/local_js.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/qless/server/views/layout.erb b/lib/qless/server/views/layout.erb
+index cb41fb6..9ac8747 100644
+--- a/lib/qless/server/views/layout.erb
++++ b/lib/qless/server/views/layout.erb
+@@ -12,7 +12,7 @@
+     <link href="<%= u '/css/docs.css' %>" rel="stylesheet">
+     <link href="<%= u '/css/jquery.noty.css' %>" rel="stylesheet">
+     <link href="<%= u '/css/noty_theme_twitter.css' %>" rel="stylesheet">
+-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
++    <script src="<%= u '/js/jquery.min.js' %>" type="text/javascript"></script>
+ 
+     <style type="text/css">
+     body {

From 0da50a133d7905aac55dc8d287a2c1e17e551c45 Mon Sep 17 00:00:00 2001
From: Michael Kefeder <mike@multiwave.ch>
Date: Thu, 26 May 2016 12:09:39 +0200
Subject: [PATCH 3/5] reflect code changes in readme

---
 README.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ac37d1f..2644694 100644
--- a/README.md
+++ b/README.md
@@ -21,14 +21,16 @@ application.
 When you want to run the container, you'll need to pass two environment
 variables to `docker run ...` to successfully start the container:
 
-1. `REDIS_HOST`: The host which is running the redis instance you want
-   to connect to. E.g. `www.example.com`
-2. `REDIS_PORT`: The port on the host which is running redis. E.g.
-   `6379`.
-3. `HTTP_PATH`: The path that the web app will be listening on. E.g.
+1. `REDIS_URL`: e.g. `redis://some-host:7000/3`
+   or alternative those 3:
+   1. `REDIS_HOST`: The host which is running the redis instance you want
+      to connect to. E.g. `www.example.com`
+   1. `REDIS_PORT`: The port on the host which is running redis. E.g.
+      `6379`.
+   1. `DB_NUM`: The redis DB number that the app will connect to.  Defaults
+      to 0.
+1. `HTTP_PATH`: Optional, the path that the web app will be listening on. default
    `/qless`
-4. `DB_NUM`: The redis DB number that the app will connect to.  Defaults
-   to 0.
 
 You will then run `bundle exec rackup qless.ru -o0.0.0.0 -p 9001` on the
 docker container to run a the qless web app and expose it on port 9001.
@@ -37,6 +39,8 @@ An example way of running the docker container is to run:
 
 ```bash
 docker run -d --net="host" -e "REDIS_HOST=localhost" -e "REDIS_PORT=6379" -e "HTTP_PATH=\/qless" <docker_image> bundle exec rackup qless.ru -o0.0.0.0 -p 9001
+# or
+docker run -e REDIS_URL="redis://127.0.0.1:6379/0" <docker_image> bundle exec rackup qless.ru -o0.0.0.0 -p 5678
 ```
 
 To run the docker container connecting to a specific redis database use:

From a0322e955d0d30efa82cf481dd58c5fb8a96eed8 Mon Sep 17 00:00:00 2001
From: Michael Kefeder <mike@multiwave.ch>
Date: Thu, 26 May 2016 12:09:55 +0200
Subject: [PATCH 4/5] allow REDIS_URL and env-var trifecta

---
 qless.ru | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/qless.ru b/qless.ru
index 6618757..3be4ba0 100644
--- a/qless.ru
+++ b/qless.ru
@@ -2,7 +2,12 @@ require 'qless'
 require 'qless/server'
 
 # use REDIS_URL="redis://some-host:7000/3"
-client = Qless::Client.new
+
+if ENV['REDIS_URL']
+  client = Qless::Client.new
+else
+  client = Qless::Client.new(:host => ENV['REDIS_HOST'], :port => ENV['REDIS_PORT'].to_i, :db => ENV['DB_NUM'].to_i )
+end
 
 QlessServer = Rack::Builder.app do
   if ENV['QLESS_BASIC_AUTH_USER'] && ENV['QLESS_BASIC_AUTH_PASSWORD']
@@ -11,10 +16,7 @@ QlessServer = Rack::Builder.app do
     end
   end
 
-  gui_path = '/qless'
-  if ENV['HTTP_PATH']
-    gui_path = ENV['HTTP_PATH']
-  end
+  gui_path = ENV.fetch('HTTP_PATH', '/qless')
 
   map(gui_path) { run Qless::Server.new(client) }
 end

From acf136665240fbc3b2f26098d08b6ed05b8cd537 Mon Sep 17 00:00:00 2001
From: Michael Kefeder <mike@multiwave.ch>
Date: Thu, 30 Jun 2016 12:10:51 +0200
Subject: [PATCH 5/5] referencing issue that causes the need to patch

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 50c4cad..db53b9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,6 @@ WORKDIR /qless
 
 RUN bundle install
 
-# make jquery local
+# make jquery local, can be removed once https://github.com/seomoz/qless/issues/244 is resolved
 RUN curl -o "$(find /var/lib/gems/ -wholename */lib/qless/server/static/js -type d)/jquery.min.js" https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js && \
   patch -d "$(find /var/lib/gems/ -wholename */lib/qless/server -type d)" -p4 < /qless/local_js.patch