From a5ba68439f3731a09808599948be293e7b961f9c Mon Sep 17 00:00:00 2001 From: Apostolof Date: Sat, 21 Nov 2020 21:52:54 +0200 Subject: [PATCH] Update Makefile targets --- docker/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 52abcc6..6fbc491 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -10,15 +10,21 @@ stop-clean-data: # Contracts targets build-contracts: - @docker build ../ -f ./concordia-contracts/Dockerfile -t concordia-contracts --build-arg TZ=Europe/Athens --build-arg SKIP_TESTS="true" --build-arg SKIP_MIGRATE="true" + @docker build ../ -f ./concordia-contracts/Dockerfile --target compile -t concordia-contracts --build-arg TZ=Europe/Athens build-migrate-contracts: - @docker build ../ -f ./concordia-contracts/Dockerfile -t concordia-contracts --build-arg TZ=Europe/Athens --build-arg SKIP_TESTS="true" + @docker build ../ -f ./concordia-contracts/Dockerfile -t concordia-contracts-migrate --build-arg TZ=Europe/Athens build-contracts-tests: @docker build ../ -f ./concordia-contracts/Dockerfile --target test -t concordia-contracts-tests --build-arg TZ=Europe/Athens +run-contract-tests: + @docker run --rm -v `pwd`/reports/:/usr/test-reports/ --env-file=./env/contracts.env concordia-contracts-tests:latest +run-contract-tests-host-chain: + @docker run --rm -v `pwd`/reports/:/usr/test-reports/ --env-file=./env/contracts.env --net=host concordia-contracts-tests:latest +run-contracts-migrate: + @docker run --rm --env-file=./env/contracts.env concordia-contracts-migrate:latest +run-contracts-migrate-host-chain: + @docker run --rm --env-file=./env/contracts.env --net=host concordia-contracts-migrate:latest get-contracts: @cd .. && docker run --rm -v `pwd`/packages/concordia-contracts/build/:/build --entrypoint=sh concordia-contracts:latest -c 'cp /usr/src/concordia/packages/concordia-contracts/build/* /build' -get-contracts-tests: - @docker run --rm -v `pwd`/reports/:/app concordia-contracts-tests:latest sh -c 'mkdir -p /app/contracts && cp /usr/test-reports/* /app/contracts' # App targets build-app: