Skip to content

Commit 75a0fad

Browse files
authored
Updates agent supported version (#1022)
* chore: updates agent supported version * chore: update sles
1 parent 33ab791 commit 75a0fad

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ jobs:
137137
version: "9"
138138
- image: "ubuntu"
139139
version: "24.04"
140-
- image: "alpine"
141-
version: "3.17"
142140
- image: "alpine"
143141
version: "3.18"
144142
- image: "alpine"
145143
version: "3.19"
146144
- image: "alpine"
147145
version: "3.20"
146+
- image: "alpine"
147+
version: "3.21"
148148
- image: "debian"
149149
version: "bullseye-slim"
150150
- image: "debian"

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ GOTIDY = ${GOMOD} tidy
3636
# | redhatenterprise | 8, 9 | |
3737
# | rockylinux | 8, 9 | |
3838
# | almalinux | 8, 9 | |
39-
# | alpine | 3.17, 3.18, 3.19, 3.20 | |
39+
# | alpine | 3.18, 3.19, 3.20, 3.21 | |
4040
# | oraclelinux | 8, 9 | |
41-
# | suse | sles12sp5, sle15 | |
41+
# | suse | sle15 | |
4242
# | freebsd | | Not supported |
4343
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
4444
OS_RELEASE ?= ubuntu

Makefile.packaging

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ GPG_PUBLIC_KEY := .key
1010

1111
DEB_DISTROS?=ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11
1212
DEB_ARCHS?=arm64 amd64
13-
RPM_DISTROS?=oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-12-x86_64 suse-15-x86_64
13+
RPM_DISTROS?=oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-15-x86_64
1414
RPM_ARCH=x86_64
1515
REDHAT_VERSIONS?=redhatenterprise-8 redhatenterprise-9
1616
REDHAT_ARCHS?=aarch64 x86_64
1717
ROCKY_VERSIONS?=rocky-8 rocky-9
1818
ROCKY_ARCHS?=aarch64 x86_64
1919
FREEBSD_DISTROS?="FreeBSD:13:amd64" "FreeBSD:14:amd64"
20-
APK_VERSIONS?=3.17 3.18 3.19 3.20
20+
APK_VERSIONS?=3.18 3.19 3.20 3.21
2121
APK_ARCHS?=aarch64 x86_64
2222
ALMA_VERSIONS?=almalinux-8 almalinux-9
2323
ALMA_ARCHS?=aarch64 x86_64

test/docker/nginx-plus/suse/Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,8 @@ RUN --mount=type=secret,id=nginx-crt,dst=/nginx-repo.crt \
2424
&& nginxPackages=" \
2525
nginx-plus \
2626
" \
27-
&& if [ "$OS_VERSION" = "sles12sp5" ]; then \
28-
zypper addrepo -G -c "https://$PACKAGES_REPO/plus/sles/12?ssl_clientcert=/etc/ssl/nginx/nginx-repo-bundle.crt&ssl_verify=peer" nginx-plus \
29-
&& zypper addrepo -G -c "https://$PACKAGES_REPO/nginx-agent/sles/12?ssl_clientcert=/etc/ssl/nginx/nginx-repo-bundle.crt&ssl_verify=peer" nginx-agent; \
30-
else \
31-
zypper addrepo -G -c "https://$PACKAGES_REPO/plus/sles/15?ssl_clientcert=/etc/ssl/nginx/nginx-repo-bundle.crt&ssl_verify=peer" nginx-plus \
32-
&& zypper addrepo -G -c "https://$PACKAGES_REPO/nginx-agent/sles/15?ssl_clientcert=/etc/ssl/nginx/nginx-repo-bundle.crt&ssl_verify=peer" nginx-agent; \
33-
fi \
27+
&& zypper addrepo -G -c "https://$PACKAGES_REPO/plus/sles/15?ssl_clientcert=/etc/ssl/nginx/nginx-repo-bundle.crt&ssl_verify=peer" nginx-plus \
28+
&& zypper addrepo -G -c "https://$PACKAGES_REPO/nginx-agent/sles/15?ssl_clientcert=/etc/ssl/nginx/nginx-repo-bundle.crt&ssl_verify=peer" nginx-agent; \
3429
&& zypper refresh \
3530
&& zypper install -y $nginxPackages
3631

0 commit comments

Comments
 (0)