diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a193be33..0ae02972 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/Makefile b/Makefile index 25d27f85..40951a3d 100644 --- a/Makefile +++ b/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: