From a834ad073afc12fc5f329741026f2bf20b43a2da Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sat, 25 Apr 2015 21:01:07 +0300 Subject: docker changes: split neo4j and rhizi changes: - rhizi and neo4j use separate containers, linked via docker link mechanism (environment files and shared bridge) - means debugging is faster using docker (still quicker by a little using run-local.sh / directly running python if no change to css/client) - rhizi docker now doesn't run deploy, it uses a volume from the deployment, similar to production scenario. Image still has multiple tools needed only for development (git, strace, ant, etc) --- src/local/docker/docker-run.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/local/docker/docker-run.sh') diff --git a/src/local/docker/docker-run.sh b/src/local/docker/docker-run.sh index 7df2d95d..5d55bee6 100755 --- a/src/local/docker/docker-run.sh +++ b/src/local/docker/docker-run.sh @@ -8,7 +8,11 @@ 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 +CONFIG_FILE=etc/rhizi-server.conf +SED_1='s|neo4j_url.*|neo4j_url = http:\/\/$N4_PORT_7474_TCP_ADDR:7474|' +SED_2='s|listen_address.*|listen_address = 0.0.0.0|' + +( + ant -f build.ant deploy-local -DlocalServerUseSymlink=false && + docker run --name rhizi.devel.$PORT -it -p $PORT:8080 --link rhizi.neo4j:n4 -v `pwd`/deploy-local:/home/rhizi rhizi/fedora:0.1 bash -c "sed -ie \"$SED_1\" $CONFIG_FILE; sed -ie \"$SED_2\" $CONFIG_FILE; python2.7 bin/rz_server.py --config-dir etc" +) -- cgit v1.3.1