From 0a20324e01210b6654c5f4415efd53d44c2c5246 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Sat, 25 Apr 2015 16:56:34 +0300
Subject: docker: move Dockerfile to res/docker, leave scripts in
 src/local/docker

---
 .gitignore                         |  2 +-
 res/docker/fedora/Dockerfile       | 15 +++++++++++++++
 src/local/docker/docker-build.sh   |  2 +-
 src/local/docker/fedora/Dockerfile | 15 ---------------
 4 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 res/docker/fedora/Dockerfile
 delete mode 100644 src/local/docker/fedora/Dockerfile

diff --git a/.gitignore b/.gitignore
index 8f718ffe..279bd5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +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
+res/docker/fedora/neo4j-community-2.2.1-unix.tar.gz
diff --git a/res/docker/fedora/Dockerfile b/res/docker/fedora/Dockerfile
new file mode 100644
index 00000000..7428f4fb
--- /dev/null
+++ b/res/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/docker/docker-build.sh b/src/local/docker/docker-build.sh
index 82b48f8d..f7931374 100755
--- a/src/local/docker/docker-build.sh
+++ b/src/local/docker/docker-build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-ROOT_DOCKER_DIR=$(dirname $(realpath $0))
+ROOT_DOCKER_DIR=$(dirname $(realpath $0))/../../../res/docker/
 FEDORA_DOCKER=$ROOT_DOCKER_DIR/fedora
 if [ ! -e .git ]; then
     echo run from top level checkout of rhizi repository
diff --git a/src/local/docker/fedora/Dockerfile b/src/local/docker/fedora/Dockerfile
deleted file mode 100644
index 7428f4fb..00000000
--- a/src/local/docker/fedora/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-- 
cgit v1.3.1