From 5d4d7c7cfe9f3e3c8212056b74f84a46728fe069 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Sun, 19 Apr 2015 12:02:44 +0200
Subject: Add defaults for erlbase and database in docker start file.

---
 packaging/docker/catlfish-dev/Dockerfile | 4 ++--
 packaging/docker/catlfish-dev/start.sh   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'packaging/docker')

diff --git a/packaging/docker/catlfish-dev/Dockerfile b/packaging/docker/catlfish-dev/Dockerfile
index 241c58d..ff2bc2c 100644
--- a/packaging/docker/catlfish-dev/Dockerfile
+++ b/packaging/docker/catlfish-dev/Dockerfile
@@ -4,7 +4,7 @@
 # `-v' flag to `docker run'.
 #
 # NOTE: The directory on the host system that's mounted at
-# /var/local/db/catlfish in the container has to be writable by a host
+# /var/db/catlfish in the container has to be writable by a host
 # user with uid 147.
 #
 # Example, running a frontend node:
@@ -13,7 +13,7 @@
 #
 # Example, running a merge node:
 # $ docker run -v /etc/catlfish:/usr/local/etc/catlfish:ro catlfish
-#       merge /usr/local/catlfish /var/local/db/catlfish-merge
+#       merge /usr/local/catlfish /var/db/catlfish-merge
 
 FROM erlang
 RUN apt-get update
diff --git a/packaging/docker/catlfish-dev/start.sh b/packaging/docker/catlfish-dev/start.sh
index d39205c..b37c829 100755
--- a/packaging/docker/catlfish-dev/start.sh
+++ b/packaging/docker/catlfish-dev/start.sh
@@ -4,6 +4,9 @@ role=$1; [ -n "$1" ] && shift
 erlbase=$1; [ -n "$1" ] && shift
 database=$1; [ -n "$1" ] && shift
 
+[ -z "$erlbase" ] && erlbase=/usr/local/catlfish
+[ -z "$database" ] && database=/var/db/catlfish-merge
+
 case $role in
     frontend|storage|signing)
         $erlbase/bin/run_erl \
-- 
cgit v1.1