summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-04-25 16:56:34 +0300
committerAlon Levy <alon@pobox.com>2015-04-25 21:05:19 +0300
commit0a20324e01210b6654c5f4415efd53d44c2c5246 (patch)
tree2e4e94d3e4cbd38ca119cbbe01949bba79e66e67
parenta654aa8a47b9425922cb7f6427e302c62f6e539b (diff)
docker: move Dockerfile to res/docker, leave scripts in src/local/docker
-rw-r--r--.gitignore2
-rw-r--r--res/docker/fedora/Dockerfile (renamed from src/local/docker/fedora/Dockerfile)0
-rwxr-xr-xsrc/local/docker/docker-build.sh2
3 files changed, 2 insertions, 2 deletions
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/src/local/docker/fedora/Dockerfile b/res/docker/fedora/Dockerfile
index 7428f4fb..7428f4fb 100644
--- a/src/local/docker/fedora/Dockerfile
+++ b/res/docker/fedora/Dockerfile
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