Skip to content

Add support for new redhat and ubuntu os #1161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 17, 2025
Merged

Add support for new redhat and ubuntu os #1161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e2d9ea
add new os
aphralG Jul 10, 2025
bc77e43
Merge branch 'main' into os-update-support
aphralG Jul 11, 2025
d127cf5
fix packaging
aphralG Jul 11, 2025
d72caa8
merge main
aphralG Jul 14, 2025
9382469
undo pipelines changes
aphralG Jul 14, 2025
6f246c4
clean up
aphralG Jul 15, 2025
4c522d3
Merge branch 'main' into os-update-support
aphralG Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ jobs:
matrix:
container:
- image: "ubuntu"
version: "24.04"
version: "25.04"
- image: "redhatenterprise"
version: "9"
version: "10"
- image: "alpine"
version: "3.22"
steps:
Expand Down
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ GOBIN ?= $$(go env GOPATH)/bin
# | OS_RELEASE | OS_VERSION | NOTES |
# | ---------------- | ----------------------------------------- | -------------------------------------------------------------- |
# | amazonlinux | 2, 2023 | |
# | ubuntu | 20.04, 22.04 24.04 | |
# | ubuntu | 22.04, 24.04, 24.10, 25.04 | |
# | debian | bullseye-slim, bookworm-slim | |
# | redhatenterprise | 8, 9 | |
# | rockylinux | 8, 9 | |
# | almalinux | 8, 9 | |
# | alpine | 3.18, 3.19, 3.20, 3.21 3.22 | |
# | oraclelinux | 8, 9 | |
# | redhatenterprise | 8, 9, 10 | |
# | rockylinux | 8, 9, 10 | |
# | almalinux | 8, 9, 10 | |
# | alpine | 3.19, 3.20, 3.21 3.22 | |
# | oraclelinux | 8, 9, 10 | |
# | suse | sle15 | |
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
OS_RELEASE ?= ubuntu
Expand Down
13 changes: 6 additions & 7 deletions Makefile.packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@ PACKAGE_BUILD ?= 1
PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v')
TARBALL_NAME := $(PACKAGE_PREFIX).tar.gz

DEB_DISTROS ?= ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11
DEB_DISTROS ?= ubuntu-plucky-24.04 ubuntu-oracular-24.10 ubuntu-noble-24.04 ubuntu-jammy-22.04 debian-bookworm-12 debian-bullseye-11
DEB_ARCHS ?= arm64 amd64
RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-15-x86_64
RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 oraclelinux-10-x86_64 suse-15-x86_64
RPM_ARCH := x86_64
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10
REDHAT_ARCHS ?= aarch64 x86_64
ROCKY_VERSIONS ?= rocky-8 rocky-9
ROCKY_VERSIONS ?= rocky-8 rocky-9 rocky-10
ROCKY_ARCHS ?= aarch64 x86_64
FREEBSD_DISTROS ?= "FreeBSD:13:amd64" "FreeBSD:14:amd64"
APK_VERSIONS ?= 3.18 3.19 3.20 3.21 3.22
APK_VERSIONS ?= 3.19 3.20 3.21 3.22
APK_ARCHS ?= aarch64 x86_64
APK_REVISION ?= 1
ALMA_VERSIONS ?= almalinux-8 almalinux-9
ALMA_VERSIONS ?= almalinux-8 almalinux-9 almalinux-10
ALMA_ARCHS ?= aarch64 x86_64
AMAZON_VERSIONS ?= amazon-2 amazon-2023
AMAZON_ARCHS ?= aarch64 x86_64
Expand Down
10 changes: 6 additions & 4 deletions scripts/packages/package-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ APK=(
alpine/v3.21/main/x86_64/nginx-agent-$VERSION.apk
alpine/v3.20/main/aarch64/nginx-agent-$VERSION.apk
alpine/v3.20/main/x86_64/nginx-agent-$VERSION.apk
alpine/v3.18/main/aarch64/nginx-agent-$VERSION.apk
alpine/v3.18/main/x86_64/nginx-agent-$VERSION.apk
alpine/v3.19/main/aarch64/nginx-agent-$VERSION.apk
alpine/v3.19/main/x86_64/nginx-agent-$VERSION.apk
)
UBUNTU=(
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~focal_arm64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~jammy_amd64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~noble_arm64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~oracular_arm64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~plucky_arm64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~jammy_arm64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~noble_amd64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~focal_amd64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~oracular_amd64.deb
ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~plucky_amd64.deb
)
DEBIAN=(
debian/pool/agent/n/nginx-agent/nginx-agent_$VERSION~bullseye_arm64.deb
Expand All @@ -85,6 +85,8 @@ SUSE=(
sles/15/x86_64/RPMS/nginx-agent-$VERSION.sles15.ngx.x86_64.rpm
)
CENTOS=(
centos/10/aarch64/RPMS/nginx-agent-$VERSION.el10.ngx.aarch64.rpm
centos/10/x86_64/RPMS/nginx-agent-$VERSION.el10.ngx.x86_64.rpm
centos/9/aarch64/RPMS/nginx-agent-$VERSION.el9.ngx.aarch64.rpm
centos/9/x86_64/RPMS/nginx-agent-$VERSION.el9.ngx.x86_64.rpm
centos/8/aarch64/RPMS/nginx-agent-$VERSION.el8.ngx.aarch64.rpm
Expand Down
Loading