fix docker makefile (#170)

* fix makefile
This commit is contained in:
JT Olio 2018-07-26 14:01:38 -06:00 committed by Alexander Leitner
parent 45a3c2e974
commit 4cff003ec9

View File

@ -49,9 +49,9 @@ test: lint
@echo done
build-binaries:
docker build -t overlay .
docker build -t hc .
run-overlay:
run-hc:
docker network create test-net
docker run -d \
@ -61,19 +61,19 @@ run-overlay:
redis
docker run -d \
--name=overlay \
--name=hc \
--network test-net \
-p 127.0.0.1:8080:8080 \
-e REDIS_ADDRESS=redis:6379 \
-e REDIS_PASSWORD="" \
-e REDIS_DB=1 \
-e OVERLAY_PORT=7070 \
overlay
hc
clean-local:
# cleanup overlay
docker stop overlay || true
docker rm overlay || true
# cleanup heavy client
docker stop hc || true
docker rm hc || true
# cleanup redis
docker stop redis || true
docker rm redis || true
@ -88,19 +88,19 @@ test-docker-clean:
-docker-compose down --rmi all
images:
docker build --build-arg VERSION=${GO_VERSION} -t storjlabs/overlay:${TAG}-${GO_VERSION} -f cmd/overlay/Dockerfile .
docker tag storjlabs/overlay:${TAG}-${GO_VERSION} storjlabs/overlay:latest
docker build --build-arg VERSION=${GO_VERSION} -t storjlabs/hc:${TAG}-${GO_VERSION} -f cmd/hc/Dockerfile .
docker tag storjlabs/hc:${TAG}-${GO_VERSION} storjlabs/hc:latest
docker build -t storjlabs/piecestore-farmer:${TAG} -f cmd/piecestore-farmer/Dockerfile .
docker tag storjlabs/piecestore-farmer:${TAG} storjlabs/piecestore-farmer:latest
push-images:
docker push storjlabs/overlay:${TAG}-${GO_VERSION}
docker push storjlabs/overlay:latest
docker push storjlabs/hc:${TAG}-${GO_VERSION}
docker push storjlabs/hc:latest
docker push storjlabs/piecestore-farmer:${TAG}
docker push storjlabs/piecestore-farmer:latest
clean-images:
-docker rmi storjlabs/overlay:${TAG}-${GO_VERSION} storjlabs/overlay:latest
-docker rmi storjlabs/hc:${TAG}-${GO_VERSION} storjlabs/hc:latest
-docker rmi storjlabs/piecestore-farmer:${TAG} storjlabs/piecestore-farmer:latest
install-deps: