Merge pull request #168 from usabilla/build-supported-nginx-versions-…

…only

Build supported nginx versions only

.github/workflows/ci.yml

@@ -31,8 +31,8 @@ jobs:
       - id: supported-nginx-versions
         name: Generate nginx
         shell: bash
-        run: | # The "1.17-nginx1-nginx" in here will be changed to "1.17 nginx1 nginx" when calling ./build-http.sh
-          echo "::set-output name=versions::[\"1.17-nginx1-nginx\", \"1.16\", \"1.15\", \"1.14\"]"
+        run: | # The "1.19-nginx1-nginx" in here will be changed to "1.19 nginx1 nginx" when calling ./build-http.sh
+          echo "::set-output name=versions::[\"1.19-nginx1-nginx\", \"1.18\"]"
   supported-php-versions:
     name: Supported PHP versions
     runs-on: ubuntu-latest

Makefile

@@ -45,16 +45,14 @@ build-fpm: clean-tags
 # Docker HTTP images build matrix ./build-nginx.sh (nginx version) (extra tag)
 build-http: BUILDINGIMAGE=http
 build-http: clean-tags
-	./build-http.sh 1.17 nginx1 nginx
-	./build-http.sh 1.16
-	./build-http.sh 1.15
-	./build-http.sh 1.14
+	./build-http.sh 1.19 nginx1 nginx
+	./build-http.sh 1.18
 
 # Docker Prometheus Exporter file images build matrix ./build-prometheus-exporter-file.sh (nginx version) (extra tag)
 # Adding arbitrary version 1.0 in order to make sure if we break compatibility we have to up it
 build-prometheus-exporter-file: BUILDINGIMAGE=prometheus-exporter-file
 build-prometheus-exporter-file: clean-tags
-	./build-prometheus-exporter-file.sh 1.15 prometheus-exporter-file1.0 prometheus-exporter-file1
+	./build-prometheus-exporter-file.sh 1.18 prometheus-exporter-file1.0 prometheus-exporter-file1
 
 .NOTPARALLEL: clean-tags
 clean-tags:

test/e2e/test_nginx_entrypoint.py

@@ -15,7 +15,7 @@ def test_nginx_sigterm_handling(host, container):
 
     logs = host.run('docker logs {}'.format(container))
 
-    assert u'signal 15 (SIGTERM) received, exiting' in logs.stderr
+    assert u'signal 3 (SIGQUIT) received, shutting down' in logs.stderr
     assert u'exit' in logs.stderr