From 4e0b76479f9e6592b96d2bd6e17cb52fb1c9d693 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Wed, 22 Apr 2015 17:54:00 +0300 Subject: moving docker files under src/local/ --- docker/docker-build.sh | 10 ---------- docker/docker-run.sh | 14 -------------- docker/fedora/Dockerfile | 15 --------------- src/local/docker/docker-build.sh | 10 ++++++++++ src/local/docker/docker-run.sh | 14 ++++++++++++++ src/local/docker/fedora/Dockerfile | 15 +++++++++++++++ 6 files changed, 39 insertions(+), 39 deletions(-) delete mode 100755 docker/docker-build.sh delete mode 100755 docker/docker-run.sh delete mode 100644 docker/fedora/Dockerfile create mode 100755 src/local/docker/docker-build.sh create mode 100755 src/local/docker/docker-run.sh create mode 100644 src/local/docker/fedora/Dockerfile diff --git a/docker/docker-build.sh b/docker/docker-build.sh deleted file mode 100755 index c6fbd7d6..00000000 --- a/docker/docker-build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 deleted file mode 100755 index 7df2d95d..00000000 --- a/docker/docker-run.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 deleted file mode 100644 index 7428f4fb..00000000 --- a/docker/fedora/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM fedora:21 -MAINTAINER Alon Levy -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/docker/docker-build.sh b/src/local/docker/docker-build.sh new file mode 100755 index 00000000..c6fbd7d6 --- /dev/null +++ b/src/local/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/src/local/docker/docker-run.sh b/src/local/docker/docker-run.sh new file mode 100755 index 00000000..7df2d95d --- /dev/null +++ b/src/local/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/src/local/docker/fedora/Dockerfile b/src/local/docker/fedora/Dockerfile new file mode 100644 index 00000000..7428f4fb --- /dev/null +++ b/src/local/docker/fedora/Dockerfile @@ -0,0 +1,15 @@ +FROM fedora:21 +MAINTAINER Alon Levy +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 -- cgit v1.3.1