Update makefile commands
@@ -208,7 +208,7 @@ logs: ##@Log tail for all service log
image-clean: clean ##@Clean all existing images to rebuild
echo "Clean all cello related images, may need to remove all containers before"
- docker images | grep "hyperledger/cello-" | awk '{print $3}' | xargs docker rmi -f
+ docker images | grep "cello-" | awk '{print $3}' | xargs docker rmi -f
start-docker-compose:
docker-compose -f bootup/docker-compose-files/${COMPOSE_FILE} up -d --force-recreate --remove-orphans
@@ -223,12 +223,17 @@ start: ##@Service Start service
stop-docker-compose:
echo "Stop all services with bootup/docker-compose-files/${COMPOSE_FILE}..."
docker-compose -f bootup/docker-compose-files/${COMPOSE_FILE} stop
+ echo "Stop all services successfully"
remove-docker-compose:
- echo "Remove all services with ${COMPOSE_FILE}..."
- docker-compose -f bootup/docker-compose-files/${COMPOSE_FILE} down -v
- rm -rf /opt/cello
+ make stop-docker-compose
+ echo "Remove all services with bootup/docker-compose-files/${COMPOSE_FILE}..."
+ if docker ps -a | grep "cello-"; then \
+ docker ps -a | grep "cello-" | awk '{print $1}' | xargs docker rm -f >/dev/null 2>&1; \
+ rm -rf /opt/cello; \
+ fi
+ echo "Remove all services successfully"
start-k8s:
@$(MAKE) -C bootup/kubernetes init-yaml
@@ -300,11 +305,12 @@ HELP_FUN = \
api-engine: # for debug only now
docker build -t hyperledger/cello-api-engine:latest -f build_image/docker/common/api-engine/Dockerfile.in ./
-dashboard:
+dashboard: # for debug only now
docker build -t hyperledger/cello-dashboard:latest -f build_image/docker/common/dashboard/Dockerfile.in ./
docker-rest-agent: # for debug only now
docker build -t hyperledger/cello-agent-docker:latest -f build_image/docker/agent/docker-rest-agent/Dockerfile.in ./ --build-arg pip=$(PIP)
+
start-dashboard:
make -C src/dashboard start;
@@ -313,6 +319,7 @@ start-dashboard:
check \
clean \
deep-clean \
+ dev-build \
changelog \
doc \
docker \
