From 666632a032ac1ee3b1c4797b4792f908849b83e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Tue, 24 Jul 2018 17:57:23 +0200 Subject: [PATCH] Update Makefile to avoid CI build errors --- Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index eb66620..48bb5b8 100644 --- a/Makefile +++ b/Makefile @@ -13,19 +13,15 @@ ifdef SENPY_FOLDER all: build run -test-%: +test-fast: docker run $(DOCKER_FLAGS) -v $$PWD/$*:/senpy-plugins/ -v $$PWD/data:/data/ --rm $(IMAGEWTAG) --only-test $(TEST_FLAGS) -test: test-. +test: docker-build test-fast dev: docker run -p $(DEV_PORT):5000 $(DOCKER_FLAGS) -ti $(DOCKER_FLAGS) -v $$PWD/$*:/senpy-plugins/ --entrypoint /bin/bash -v $$PWD/data:/data/ --rm $(IMAGEWTAG) -clean-docker: - @docker ps -a | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[1] != "${VERSION}"){ print $$1;}}' | xargs docker rm 2>/dev/null|| true - @docker images | awk '/$(REPO)\/$(NAME)/{ split($$2, vers, "-"); if(vers[1] != "${VERSION}"){ print $$1":"$$2;}}' | xargs docker rmi 2>/dev/null|| true - -.PHONY:: test test-% build-% build test test_pip run clean +.PHONY:: test test-fast dev include .makefiles/base.mk include .makefiles/k8s.mk