Skip to content

Commit

Permalink
Build supported nginx versions only
Browse files Browse the repository at this point in the history
Based on information from: http://nginx.org/en/download.html
  • Loading branch information
WyriHaximus committed Feb 25, 2021
1 parent b2e2e44 commit fff22ba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit fff22ba

Please sign in to comment.