Skip to content

Commit

Permalink
Fixed docker-compose file and docker-build make target
Browse files Browse the repository at this point in the history
  • Loading branch information
Albert Schimpf committed Nov 5, 2019
1 parent a4e7bc2 commit 1adedbb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
REBAR = $(shell pwd)/rebar3
COVERPATH = $(shell pwd)/_build/test/cover
.PHONY: rel test relgentlerain
.PHONY: rel test relgentlerain docker-build docker-run

all: compile

Expand Down Expand Up @@ -94,12 +94,9 @@ dialyzer:
${REBAR} dialyzer

docker-build:
DOCKERTMPDIR="$(shell mktemp -d ./docker-tmpdir.XXXXXXXX)" ; \
wget "https://raw.githubusercontent.com/AntidoteDB/docker-antidote/master/local-build/Dockerfile" -O "$$DOCKERTMPDIR/Dockerfile" ; \
wget "https://raw.githubusercontent.com/AntidoteDB/docker-antidote/master/local-build/entrypoint.sh" -O "$$DOCKERTMPDIR/entrypoint.sh" ; \
wget "https://raw.githubusercontent.com/AntidoteDB/docker-antidote/master/local-build/start_and_attach.sh" -O "$$DOCKERTMPDIR/start_and_attach.sh" ; \
docker build -f $$DOCKERTMPDIR/Dockerfile --build-arg DOCKERFILES=$$DOCKERTMPDIR -t antidotedb:local-build . ; \
[ ! -d $$DOCKERTMPDIR ] || rm -r $$DOCKERTMPDIR
tmpdir=`mktemp -d` ; \
wget "https://raw.githubusercontent.com/AntidoteDB/docker-antidote/v0.2.1/local-build/Dockerfile" -O "$$tmpdir/Dockerfile" ; \
docker build -f $$tmpdir/Dockerfile -t antidotedb:local-build .

docker-run: docker-build
docker run -d --name antidote -p "8087:8087" antidotedb:local-build
Expand All @@ -108,4 +105,3 @@ docker-clean:
ifneq ($(docker images -q antidotedb:local-build 2> /dev/null), "")
docker image rm -f antidotedb:local-build
endif
[ ! -d docker-tmpdir* ] || rm -r docker-tmpdir*
6 changes: 2 additions & 4 deletions monitoring/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
version: '2'

services:
antidote:
image: antidotedb/antidote:latest
environment:
NODE_NAME: "antidote@antidote"
SHORT_NAME: "true"
image: antidotedb:local-build
ports:
- "8087:8087"
prometheus:
Expand Down

0 comments on commit 1adedbb

Please sign in to comment.