From 743d9801e99d5adb2d552ef198d6c8832c91c545 Mon Sep 17 00:00:00 2001 From: Thomas LEVEIL Date: Sat, 11 Feb 2017 03:58:23 +0100 Subject: [PATCH] TESTS: make test now runs tests from a docker container --- test2/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test2/Makefile b/test2/Makefile index 19181eb..e00e495 100644 --- a/test2/Makefile +++ b/test2/Makefile @@ -4,14 +4,13 @@ update-dependencies: requirements/build.sh - pip install -U -r requirements/python-requirements.txt test-debian: update-dependencies docker build -t jwilder/nginx-proxy:test .. - pytest -v + ./test.sh -v test-alpine: update-dependencies docker build -f ../Dockerfile.alpine -t jwilder/nginx-proxy:test .. - pytest -v + ./test.sh -v test: test-debian test-alpine