merged #12

Author: jstriebel

.circleci/config.yml

@@ -146,7 +146,7 @@ jobs:
             -u scalableminds
             -r fossildb
             -c $(git rev-parse HEAD)
-            -b "executable jar of __fossildb__"
+            -b "executable jar of __FossilDB__"
             $(cat /tmp/workspace/version)
             /tmp/workspace/fossildb.jar
 

README.md

@@ -3,3 +3,25 @@
 Versioned Key-Value Store with RocksDB backend and gRPC API
 
 [![CircleCI](https://circleci.com/gh/scalableminds/fossildb.svg?style=svg&circle-token=89b8341a216f2ce9e8f40c913b45196b3694347a)](https://circleci.com/gh/scalableminds/fossildb)
+
+## Installation & Usage
+You can download the [executable jar](https://github.com/scalableminds/fossildb/releases/latest),
+```
+java -jar fossildb.jar -c default
+```
+or use a [docker image](https://hub.docker.com/r/scalableminds/fossildb/tags) and run
+```
+docker run scalableminds/fossildb:master fossildb -c default
+```
+
+For further options, see `help`:
+```
+  -p, --port <num>         port to listen on. Default: 7155
+  -d, --dataDir <path>     database directory. Default: data
+  -b, --backupDir <path>   backup directory. Default: backup
+  -c, --columnFamilies <cf1>,<cf2>...
+                           column families of the database (created if there is no db yet)
+```
+
+## API
+FossilDB can be used via its [gRPC API](src/main/protobuf/fossildbapi.proto).

fossildb

@@ -4,7 +4,12 @@ set -Eeuo pipefail
 FOSSILDB_HOME=$(dirname $(readlink -f $0))
 
 if [ "$(id -u)" = '0' ]; then
-  chown -R fossildb $FOSSILDB_HOME/data $FOSSILDB_HOME/backup
+  for SUBDIR in data backup; do
+    DIR=$FOSSILDB_HOME/$SUBDIR
+    if [ -d "$DIR" ]; then
+      chown -R fossildb  $DIR
+    fi
+  done
   exec gosu fossildb java -jar $FOSSILDB_HOME/fossildb.jar $@
 else
   exec java -jar $FOSSILDB_HOME/fossildb.jar $@