diff options
| author | Alon Levy <alon@pobox.com> | 2015-04-25 16:56:34 +0300 |
|---|---|---|
| committer | Alon Levy <alon@pobox.com> | 2015-04-25 21:05:19 +0300 |
| commit | 0a20324e01210b6654c5f4415efd53d44c2c5246 (patch) | |
| tree | 2e4e94d3e4cbd38ca119cbbe01949bba79e66e67 /src | |
| parent | a654aa8a47b9425922cb7f6427e302c62f6e539b (diff) | |
docker: move Dockerfile to res/docker, leave scripts in src/local/docker
Diffstat (limited to 'src')
| -rwxr-xr-x | src/local/docker/docker-build.sh | 2 | ||||
| -rw-r--r-- | src/local/docker/fedora/Dockerfile | 15 |
2 files changed, 1 insertions, 16 deletions
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 |