Merge pull request #1044 from praekelt/feature/adhoc-docker-updates

Some Docker updates

docker/Dockerfile

@@ -1,11 +1,10 @@
 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
 WORKDIR /app
 
-ENTRYPOINT ["eval-args.sh", "dinit", "/app/vumi-entrypoint.sh"]
-CMD []
+CMD ["/app/vumi-entrypoint.sh"]

docker/vumi-entrypoint.sh

@@ -1,30 +1,21 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+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
+if [[ -n "$AMQP_HOST" ]]; then
   AMQP_OPTS="--hostname $AMQP_HOST \
     --port ${AMQP_PORT:-5672} \
     --vhost ${AMQP_VHOST:-/} \
     --username ${AMQP_USERNAME:-guest} \
     --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);}')