From 39f822dd8bfea95e6e91d2e9b4c46d33b639d13e Mon Sep 17 00:00:00 2001
From: Kevin Marilleau <kevin.marilleau@gmail.com>
Date: Fri, 19 Mar 2021 16:44:50 +0100
Subject: [PATCH] refactor(ci): :recycle: refactor makefile and modify its
 usage on CI

---
 .github/workflows/test.yml | 10 +++++++---
 Makefile                   | 14 +++++++++-----
 test/requirements/build.sh |  6 ------
 3 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100755 test/requirements/build.sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b1930a5..cde7ff3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        docker_image: [alpine, debian]
+        base_docker_image: [alpine, debian]
 
     steps:
       - uses: actions/checkout@v2
@@ -27,7 +27,11 @@ jobs:
         working-directory: test/requirements
 
       - name: Build Docker web server image
-        run: make update-dependencies
+        run: make build-webserver
+
+      - name: Build Docker nginx proxy test image
+        run: make build-nginx-proxy-test-${{ matrix.base_docker_image }}
 
       - name: Run tests
-        run: make test-${{ matrix.docker_image }}
+        run: pytest
+        working-directory: test
\ No newline at end of file
diff --git a/Makefile b/Makefile
index d7db2b8..18fcd33 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,19 @@
 .PHONY : test-debian test-alpine test
 
 
-update-dependencies:
-	test/requirements/build.sh
+build-webserver:
+	docker build -t web test/requirements/web
 
-test-debian: update-dependencies
+build-nginx-proxy-test-debian:
 	docker build -t nginxproxy/nginx-proxy:test .
+
+build-nginx-proxy-test-alpine:
+	docker build -f Dockerfile.alpine -t nginxproxy/nginx-proxy:test .
+
+test-debian: build-webserver build-nginx-proxy-test-debian
 	test/pytest.sh
 
-test-alpine: update-dependencies
-	docker build -f Dockerfile.alpine -t nginxproxy/nginx-proxy:test .
+test-alpine: build-webserver build-nginx-proxy-test-alpine
 	test/pytest.sh
 
 test: test-debian test-alpine
diff --git a/test/requirements/build.sh b/test/requirements/build.sh
deleted file mode 100755
index f29897a..0000000
--- a/test/requirements/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-docker build -t web $DIR/web
\ No newline at end of file