diff --git a/Dockerfile b/DOCKER/Dockerfile similarity index 96% rename from Dockerfile rename to DOCKER/Dockerfile index 3d1738203f372e1db6048e44d850a09832eb6cba..4ee8372fc642afc79265b507633f812221ad0f1f 100644 --- a/Dockerfile +++ b/DOCKER/Dockerfile @@ -20,4 +20,4 @@ ADD . $repo WORKDIR $repo RUN cd ./cmd/erisdb && go install USER eris -ENTRYPOINT ["erisdb"] \ No newline at end of file +ENTRYPOINT ["erisdb"] diff --git a/DOCKER/docker_build.sh b/DOCKER/docker_build.sh new file mode 100755 index 0000000000000000000000000000000000000000..c914d70bf1dedb6285a5e1d8a373fdb09223f875 --- /dev/null +++ b/DOCKER/docker_build.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +CUR=`pwd` + +if [ $CUR = "$GOPATH/src/github.com/eris-ltd/erisdb" ]; then + + docker build -t eris-db -f DOCKER/Dockerfile . +else + docker build -t eris-db -f Dockerfile .. +fi + + + diff --git a/docker_run.sh b/DOCKER/docker_run.sh similarity index 99% rename from docker_run.sh rename to DOCKER/docker_run.sh index fee8a79b96cf289ea08b2d4f9b403489f8fc05ed..41311b33ced0d782edebb379643408eeb3d8d0bc 100755 --- a/docker_run.sh +++ b/DOCKER/docker_run.sh @@ -16,4 +16,4 @@ elif [ "$RUNNING" == "false" ]; then else echo "Container 'eris-db' not found. Creating." docker run --name eris-db -v $ERIS_PATH:/home/eris/.eris -p 46656:46656 -p 46657:46657 -p 1337:1337 eris-db -fi \ No newline at end of file +fi diff --git a/docker_build.sh b/docker_build.sh deleted file mode 100755 index d6648b85631b3cf5a7c22c8fec2019eaf6509f9f..0000000000000000000000000000000000000000 --- a/docker_build.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -docker build -t eris-db . \ No newline at end of file