Improve Makefile rules.

Start Keep container from run.sh.

diff --git a/docker/Makefile b/docker/Makefile
index 8c1c79c2ce196371f17293851e2b5cde72629902..fa05068c50184dcdaba578b0e572cabe1476de8d 100644 (file)
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,7 +1,7 @@
 all: api-image docserver-image workbench-image warehouse-image sso-image
 
 clean:
-       rm *-image */generated/*
+       -rm *-image */generated/*
 
 # ============================================================
 # Dependencies for */generated files which are prerequisites
@@ -77,16 +77,19 @@ $(SSO_GENERATED): $(SSO_GENERATED_IN)
 # The main Arvados servers: api, docserver, workbench, warehouse
 
 api-image: passenger-image $(API_DEPS)
+       mkdir -p api/generated
        tar -c -z -f api/generated/api.tar.gz -C ../services api
        ./docker_build -t arvados/api api
        echo -n "Built at $(date)" > api-image
 
-docserver-image: base-image $(DOCSERVER_DEPS) 
+docserver-image: base-image $(DOCSERVER_DEPS)
+       mkdir -p docserver/generated
        tar -c -z -f docserver/generated/doc.tar.gz -C .. doc
        ./docker_build -t arvados/docserver docserver
        echo -n "Built at $(date)" > docserver-image
 
 workbench-image: passenger-image $(WORKBENCH_DEPS)
+       mkdir -p workbench/generated
        tar -c -z -f workbench/generated/workbench.tar.gz -C ../apps workbench
        ./docker_build -t arvados/workbench workbench
        echo -n "Built at $(date)" > workbench-image

diff --git a/docker/run.sh b/docker/run.sh
index 94aea666160090a54a7f64909163e70edb262b49..9aaba361848afa541ebebd0c0db2309f91c8bd7c 100755 (executable)
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -13,4 +13,24 @@ docker run -d -i -t -p 9900:443 -name api_server -link sso_server:sso arvados/ap
 echo "Starting workbench server:     http://localhost:9899"
 docker run -d -i -t -p 9899:80 -link api_server:api arvados/workbench
 
+echo "Starting keep server:        http://localhost:25107"
 
+# Mount a keep volume if we don't already have one
+keepvolume=""
+for mountpoint in $(cut -d ' ' -f 2 /proc/mounts)
+do
+    if [ -d "$mountpoint/keep" ]
+    then
+       keepvolume=$mountpoint
+    fi
+done
+
+if [ ! "$keepvolume" ]
+then
+    keepvolume=$(mktemp -d)
+    echo "mounting 512M tmpfs keep volume in $keepvolume"
+    sudo mount -t tmpfs -o size=512M tmpfs $keepvolume
+    mkdir $keepvolume/keep
+fi
+
+docker run -d -i -t -p 25107:25107 -v $keepvolume:/dev/keep-0 arvados/warehouse