docker: initial commit

5 files changed, 49 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 3324dc5e..8f718ffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ src/client/main-built.js
 src/client/main-built.js.map
 res/templates/fragment/version.txt
 src/server/tools
+docker/fedora/neo4j-community-2.2.1-unix.tar.gz
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
new file mode 100755
index 00000000..c6fbd7d6
--- /dev/null
+++ b/docker/docker-build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+if [ ! -e .git ]; then
+    echo run from top level checkout of rhizi repository
+    exit 0
+fi
+if [ ! -e docker/fedora/neo4j-community-2.2.1-unix.tar.gz ]; then
+    echo downloading neo4j community edition 2.2.1
+    wget http://neo4j.com/artifact.php?name=neo4j-community-2.2.1-unix.tar.gz -Odocker/fedora/neo4j-community-2.2.1-unix.tar.gz
+fi
+docker build -t alon/rhizi:test1 docker/fedora
diff --git a/docker/docker-run.sh b/docker/docker-run.sh
new file mode 100755
index 00000000..7df2d95d
--- /dev/null
+++ b/docker/docker-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+if [ ! -e .git ]; then
+    echo run from top level checkout of rhizi repository
+    exit 0
+fi
+# cannot bind to localhost in docker, must bind to 0.0.0.0
+PORT=8080
+if [ "x$1" != "x" ]; then
+    PORT=$1
+fi
+sed -i -e 's/listen_address = 127.0.0.1/listen_address = 0.0.0.0/' res/etc/rhizi-server.conf
+sed -i -e "s/listen_port.*/listen_port = $PORT/" res/etc/rhizi-server.conf
+sed -i -e "s/SERVER_NAME.*/SERVER_NAME = rhizi.local:$PORT/" res/etc/rhizi-server.conf
+docker run -it -p $PORT:$PORT -v `pwd`:/home/rhizi alon/rhizi:test1 ./run-both-local.sh
diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
new file mode 100644
index 00000000..7428f4fb
--- /dev/null
+++ b/docker/fedora/Dockerfile
@@ -0,0 +1,15 @@
+FROM fedora:21
+MAINTAINER Alon Levy <alon@pobox.com>
+RUN yum install -y dnf
+# development requirements
+RUN dnf install -y wget tar lsof java git iproute make rubygem-sass ant ipython tmux strace
+# runtime requirements
+RUN dnf install -y python-flask net-tools python-pip python-gevent-websocket python-gevent-websocketio python-gevent-socketio
+# some of these have fedora packages. some of thoes are out of date
+# python-futures
+RUN pip install enum futures flask-socketio
+ADD neo4j-community-2.2.1-unix.tar.gz /home/
+RUN sed -i -e's/dbms.security.auth_enabled=true/dbms.security.auth_enabled=false/' /home/neo4j-community-2.2.1/conf/neo4j-server.properties
+#RUN cd /root/ && wget http://neo4j.com/artifact.php?name=neo4j-community-2.2.1-unix.tar.gz -Oneo4j.tar.gz
+WORKDIR /home/rhizi
+ENV NEO4J_ROOT /home/neo4j-community-2.2.1
diff --git a/src/local/utils.sh b/src/local/utils.sh
index df5e2fb6..0738498b 100644
--- a/src/local/utils.sh
+++ b/src/local/utils.sh
@@ -14,14 +14,20 @@ else
     fi
 fi
 
-function quit_if_no_neo4j_running () {
+function neo4j_running () {
     if [ `uname` == "Darwin" ]; then
         neo4j_count=`netstat -na -ptcp 2>/dev/null | grep 7474 | wc -l`
     else
         neo4j_count=`netstat -ltnop 2>/dev/null | grep 7474 | wc -l`
     fi
-    if [ $neo4j_count == "0" ]; then
-        echo run neo4j please
+    [ $neo4j_count -gt "0" ]
+}
+
+function quit_if_no_neo4j_running () {
+    if neo4j_running ; then
+        return 0
+    else
+        echo neo4j not running
         exit 0
     fi
 }