From a9516963179f63d7ecea076af4a511b66df0bac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Mon, 8 Jan 2018 00:44:40 +0100 Subject: [PATCH] Updated makefiles from senpy Use the current build version in tests. Tests will be slower (they require a build), but they will always contain the latest dockerfile changes. --- .makefiles/python.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.makefiles/python.mk b/.makefiles/python.mk index 2ad9559..a4b4211 100644 --- a/.makefiles/python.mk +++ b/.makefiles/python.mk @@ -28,7 +28,7 @@ quick_build: $(addprefix build-, $(PYMAIN)) build: $(addprefix build-, $(PYVERSIONS)) ## Build all images / python versions build-%: version Dockerfile-% ## Build a specific version (e.g. build-2.7) - docker build -t '$(IMAGEWTAG)-python$*' --cache-from $(IMAGENAME):python$* -f Dockerfile-$* .; + docker build -t '$(IMAGEWTAG)-python$*' -f Dockerfile-$* .; dev-%: ## Launch a specific development environment using docker (e.g. dev-2.7) @docker start $(NAME)-dev$* || (\ @@ -42,10 +42,10 @@ dev: dev-$(PYMAIN) ## Launch a development environment using docker, using the d quick_test: test-$(PYMAIN) -test-%: ## Run setup.py from in an isolated container, built from the base image. (e.g. test-2.7) +test-%: build-% ## Run setup.py from in an isolated container, built from the base image. (e.g. test-2.7) # This speeds tests up because the image has most (if not all) of the dependencies already. docker rm $(NAME)-test-$* || true - docker create -ti --name $(NAME)-test-$* --entrypoint="" -w /usr/src/app/ $(IMAGENAME):python$* python setup.py test + docker create -ti --name $(NAME)-test-$* --entrypoint="" -w /usr/src/app/ $(IMAGEWTAG)-python$* python setup.py test docker cp . $(NAME)-test-$*:/usr/src/app docker start -a $(NAME)-test-$*