summaryrefslogtreecommitdiff
path: root/examples/docker-minimal/docker/merge.sh
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-02-24 19:26:21 +0100
committerLinus Nordberg <linus@nordberg.se>2015-02-24 22:31:42 +0100
commit307071e1b0d536abbec277764b427d145d4f42b7 (patch)
treea23013c9ce6c21af2752118d46d0200c230a38bd /examples/docker-minimal/docker/merge.sh
parent81a35a696d813ac5803afe602e549b56a9dfd9c4 (diff)
Add packaging and examples.
Diffstat (limited to 'examples/docker-minimal/docker/merge.sh')
-rw-r--r--examples/docker-minimal/docker/merge.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/examples/docker-minimal/docker/merge.sh b/examples/docker-minimal/docker/merge.sh
new file mode 100644
index 0000000..5eda54d
--- /dev/null
+++ b/examples/docker-minimal/docker/merge.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+while true; do
+ catlfish/tools/merge.py \
+ --baseurl https://127.0.0.1:8080/ \
+ --storage https://127.0.0.1:8081/ \
+ --frontend https://127.0.0.1:8082/ \
+ --mergedb mergedb \
+ --keyfile test/eckey.pem