Skip to content

Commit a110d0c

Browse files
update NGINX versions to build against
1 parent 7085f5c commit a110d0c

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

.github/workflows/make-releases.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,14 @@ jobs:
3030
strategy:
3131
matrix:
3232
# NGINX versions to build/test against
33-
nginx-version: ['1.20.2', '1.22.1', '1.24.0', '1.26.2', '1.27.3']
33+
nginx-version:
34+
- '1.20.2' # legacy
35+
- '1.22.1' # legacy
36+
- '1.24.0' # legacy
37+
- '1.26.2' # stable
38+
- '1.26.3' # stable
39+
- '1.27.3' # mainline
40+
- '1.27.4' # mainline
3441

3542
# The following versions of libjwt are compatible:
3643
# * v1.0 - v1.12.0

scripts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@ SSL_IMAGE_MAP[$SSL_VERSION_3_0_11]="bookworm-slim:openssl-${SSL_VERSION_3_0_11}"
1919
SSL_IMAGE_MAP[$SSL_VERSION_3_2_1]="bookworm-slim:openssl-${SSL_VERSION_3_2_1}"
2020

2121
# supported NGINX versions -- for binary distribution
22-
NGINX_VERSION_LEGACY_1='1.20.2'
23-
NGINX_VERSION_LEGACY_2='1.22.1'
24-
NGINX_VERSION_LEGACY_3='1.24.0'
25-
NGINX_VERSION_STABLE='1.26.2'
26-
NGINX_VERSION_MAINLINE='1.27.3'
27-
NGINX_VERSIONS=(${NGINX_VERSION_LEGACY_1} ${NGINX_VERSION_LEGACY_2} ${NGINX_VERSION_LEGACY_3} ${NGINX_VERSION_STABLE} ${NGINX_VERSION_MAINLINE})
28-
NGINX_VERSION=${NGINX_VERSION:-${NGINX_VERSION_STABLE}}
29-
22+
NGINX_VERSIONS=(
23+
'1.20.2' # legacy
24+
'1.22.1' # legacy
25+
'1.24.0' # legacy
26+
'1.26.2' # stable
27+
'1.26.3' # stable
28+
'1.27.3' # mainline
29+
'1.27.4' # mainline
30+
)
31+
NGINX_VERSION=${NGINX_VERSION:-${NGINX_VERSIONS[-1]}}
3032
IMAGE_NAME=${IMAGE_NAME:-nginx-auth-jwt}
3133
FULL_IMAGE_NAME=${ORG_NAME:-teslagov}/${IMAGE_NAME}
32-
3334
TEST_CONTAINER_NAME_PREFIX="${IMAGE_NAME}-test"
3435
TEST_COMPOSE_FILE='test/docker-compose-test.yml'
3536

test/test-nginx.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BASE_IMAGE
22

3-
FROM ${BASE_IMAGE:?required} AS NGINX
3+
FROM ${BASE_IMAGE:?required}
44
ARG PORT
55
ARG SSL_PORT
66

0 commit comments

Comments
 (0)