refactor(ci): ♻️ refactor makefile and modify its usage on CI

.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

Makefile

@@ -2,15 +2,19 @@
 .PHONY : test-debian test-alpine test
 
 
-update-dependencies:
+build-webserver:
-	test/requirements/build.sh
+	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
+test-alpine: build-webserver build-nginx-proxy-test-alpine
-	docker build -f Dockerfile.alpine -t nginxproxy/nginx-proxy:test .
 	test/pytest.sh
 
 test: test-debian test-alpine

test/requirements/build.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-docker build -t web $DIR/web