From 22339cbeff5b4f3796abd8227fff8e646d9df64f Mon Sep 17 00:00:00 2001
From: Jamie Hewland <jhewland@gmail.com>
Date: Tue, 14 Jun 2016 11:20:34 +0200
Subject: [PATCH 1/5] docker: Bump Vumi version

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 520c3a497..75fa73bc5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM praekeltfoundation/python-base
 MAINTAINER Praekelt Foundation <dev@praekeltfoundation.org>
 
-ENV VUMI_VERSION "0.6.2"
+ENV VUMI_VERSION "0.6.8"
 RUN pip install vumi==$VUMI_VERSION
 
 COPY ./vumi-entrypoint.sh /app/vumi-entrypoint.sh

From 32a4b7de4d4c6a8d7bad79d49f1f9c6e7ce1c1fc Mon Sep 17 00:00:00 2001
From: Jamie Hewland <jhewland@gmail.com>
Date: Tue, 14 Jun 2016 11:21:12 +0200
Subject: [PATCH 2/5] docker: Get bash from env

---
 docker/vumi-entrypoint.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/vumi-entrypoint.sh b/docker/vumi-entrypoint.sh
index e18f4fb2d..e65cb3ffa 100755
--- a/docker/vumi-entrypoint.sh
+++ b/docker/vumi-entrypoint.sh
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 TWISTD_COMMAND="${TWISTD_COMMAND:-vumi_worker}"
 

From 7979a1ce679e2fca3839cc79971837e13104efce Mon Sep 17 00:00:00 2001
From: Jamie Hewland <jhewland@gmail.com>
Date: Tue, 14 Jun 2016 11:23:06 +0200
Subject: [PATCH 3/5] docker: Use shell string expansion rather than ifs

---
 docker/vumi-entrypoint.sh | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/docker/vumi-entrypoint.sh b/docker/vumi-entrypoint.sh
index e65cb3ffa..22ce2f716 100755
--- a/docker/vumi-entrypoint.sh
+++ b/docker/vumi-entrypoint.sh
@@ -3,15 +3,8 @@ set -e
 
 TWISTD_COMMAND="${TWISTD_COMMAND:-vumi_worker}"
 
-WORKER_CLASS_OPT=""
-if [ -n "$WORKER_CLASS" ]; then
-  WORKER_CLASS_OPT="--worker-class $WORKER_CLASS"
-fi
-
-CONFIG_OPT=""
-if [ -n "$CONFIG_FILE" ]; then
-  CONFIG_OPT="--config $CONFIG_FILE"
-fi
+WORKER_CLASS_OPT="${WORKER_CLASS:+--worker-class $WORKER_CLASS}"
+CONFIG_OPT="${CONFIG_FILE:+--config $CONFIG_FILE}"
 
 AMQP_OPTS=""
 if [ -n "$AMQP_HOST" ]; then
@@ -22,10 +15,7 @@ if [ -n "$AMQP_HOST" ]; then
     --password ${AMQP_PASSWORD:-guest}"
 fi
 
-SENTRY_OPT=""
-if [ -n "$SENTRY_DSN" ]; then
-  SENTRY_OPT="--sentry $SENTRY_DSN"
-fi
+SENTRY_OPT="${SENTRY_DSN:+--sentry $SENTRY_DSN}"
 
 SET_OPTS=$(env | grep ^VUMI_OPT_ | sed -e 's/^VUMI_OPT_//' -e 's/=/ /' | awk '{printf("%s=%s:%s ", "--set-option", tolower($1), $2);}')
 

From 4282cff4988547b7ac5a5ff41d79e3e72c59a1d5 Mon Sep 17 00:00:00 2001
From: Jamie Hewland <jhewland@gmail.com>
Date: Tue, 14 Jun 2016 11:27:05 +0200
Subject: [PATCH 4/5] docker: Use safer bash test

---
 docker/vumi-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/vumi-entrypoint.sh b/docker/vumi-entrypoint.sh
index 22ce2f716..fb601354e 100755
--- a/docker/vumi-entrypoint.sh
+++ b/docker/vumi-entrypoint.sh
@@ -7,7 +7,7 @@ WORKER_CLASS_OPT="${WORKER_CLASS:+--worker-class $WORKER_CLASS}"
 CONFIG_OPT="${CONFIG_FILE:+--config $CONFIG_FILE}"
 
 AMQP_OPTS=""
-if [ -n "$AMQP_HOST" ]; then
+if [[ -n "$AMQP_HOST" ]]; then
   AMQP_OPTS="--hostname $AMQP_HOST \
     --port ${AMQP_PORT:-5672} \
     --vhost ${AMQP_VHOST:-/} \

From 66c7a5f8604b13947bf348a49f2a6accb35d17d6 Mon Sep 17 00:00:00 2001
From: Jamie Hewland <jhewland@gmail.com>
Date: Tue, 14 Jun 2016 12:15:18 +0200
Subject: [PATCH 5/5] docker: Make entrypoint script the CMD

---
 docker/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 75fa73bc5..db7b198d1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,5 +7,4 @@ RUN pip install vumi==$VUMI_VERSION
 COPY ./vumi-entrypoint.sh /app/vumi-entrypoint.sh
 WORKDIR /app
 
-ENTRYPOINT ["eval-args.sh", "dinit", "/app/vumi-entrypoint.sh"]
-CMD []
+CMD ["/app/vumi-entrypoint.sh"]