Skip to content

Add Alpine 3.22 Support #1150

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
aphralG merged 7 commits into from
Jul 3, 2025
Merged

Add Alpine 3.22 Support #1150

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73e4da7
add Alpine 3.22
aphralG Jun 30, 2025
2772340
update pipeline
aphralG Jun 30, 2025
ff29b99
update pipeline
aphralG Jun 30, 2025
4b0b88d
update makefile
aphralG Jun 30, 2025
c8ffcd0
add back in ubuntu test
aphralG Jun 30, 2025
e3f18d2
fix test
aphralG Jun 30, 2025
502eb85
undo changes
aphralG Jul 2, 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: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,12 @@ jobs:
strategy:
matrix:
container:
- image: "ubuntu"
version: "24.04"
- image: "redhatenterprise"
version: "9"
- image: "alpine"
version: "3.19"
version: "3.22"
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
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 @@ -22,12 +22,12 @@ GOBIN ?= $$(go env GOPATH)/bin
# | redhatenterprise | 8, 9 | |
# | rockylinux | 8, 9 | |
# | almalinux | 8, 9 | |
# | alpine | 3.17, 3.18, 3.19, 3.20, 3.21 | |
# | alpine | 3.18, 3.19, 3.20, 3.21 3.22 | |
# | oraclelinux | 8, 9 | |
# | suse | sles12sp5, sle15 | |
# | suse | sle15 | |
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
OS_RELEASE ?= ubuntu
OS_VERSION ?= 22.04
OS_VERSION ?= 24.04
BASE_IMAGE = "docker.io/$(OS_RELEASE):$(OS_VERSION)"
IMAGE_TAG = "agent_$(OS_RELEASE)_$(OS_VERSION)"
DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
Expand All @@ -43,8 +43,8 @@ PROTO_DIR := proto
BINARY_NAME := nginx-agent
PROJECT_DIR = cmd/agent
PROJECT_FILE = main.go
COLLECTOR_PATH ?= /etc/nginx-agent/opentelemetry-collector-agent.yaml
MANIFEST_DIR ?= /var/lib/nginx-agent
COLLECTOR_PATH ?= /opt/homebrew/etc/nginx-agent/opentelemetry-collector-agent.yaml
Copy link
Collaborator

@dhurley dhurley Jul 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you undo these changes?

MANIFEST_DIR ?= /opt/homebrew/var/lib/nginx-agent
DIRS = $(BUILD_DIR) $(TEST_BUILD_DIR) $(BUILD_DIR)/$(DOCS_DIR) $(BUILD_DIR)/$(DOCS_DIR)/$(PROTO_DIR)
$(shell mkdir -p $(DIRS))

Expand All @@ -62,7 +62,7 @@ APK_PACKAGE := ./build/$(PACKAGE_NAME).apk
DEB_PACKAGE := ./build/$(PACKAGE_NAME).deb
RPM_PACKAGE := ./build/$(PACKAGE_NAME).rpm

MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
MOCK_MANAGEMENT_PLANE_LOG_LEVEL ?= INFO
MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS ?= 127.0.0.1:0
MOCK_MANAGEMENT_PLANE_API_ADDRESS ?= 127.0.0.1:0
Expand Down
4 changes: 2 additions & 2 deletions Makefile.packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ 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_ARCHS ?= arm64 amd64
RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-12-x86_64 suse-15-x86_64
RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-15-x86_64
RPM_ARCH := x86_64
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9
REDHAT_ARCHS ?= aarch64 x86_64
ROCKY_VERSIONS ?= rocky-8 rocky-9
ROCKY_ARCHS ?= aarch64 x86_64
FREEBSD_DISTROS ?= "FreeBSD:13:amd64" "FreeBSD:14:amd64"
APK_VERSIONS ?= 3.18 3.19 3.20 3.21
APK_VERSIONS ?= 3.18 3.19 3.20 3.21 3.22
APK_ARCHS ?= aarch64 x86_64
APK_REVISION ?= 1
ALMA_VERSIONS ?= almalinux-8 almalinux-9
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ require (
go.opentelemetry.io/collector/processor v1.30.0
go.opentelemetry.io/collector/processor/batchprocessor v0.124.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.0
go.opentelemetry.io/collector/processor/processortest v0.124.0
go.opentelemetry.io/collector/receiver v1.30.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.0
go.opentelemetry.io/collector/receiver/receivertest v0.124.0
Expand All @@ -74,6 +75,7 @@ require (
go.opentelemetry.io/collector/scraper/scrapertest v0.124.0
go.opentelemetry.io/otel v1.35.0
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/mod v0.23.0
golang.org/x/sync v0.13.0
Expand Down Expand Up @@ -260,7 +262,6 @@ require (
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.124.0 // indirect
go.opentelemetry.io/collector/processor/processortest v0.124.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.124.0 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.124.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.124.0 // indirect
Expand Down Expand Up @@ -289,7 +290,6 @@ require (
go.opentelemetry.io/otel/sdk/log v0.11.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.12.0 // indirect
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
golang.org/x/tools v0.30.0 // indirect
Expand Down
5 changes: 3 additions & 2 deletions scripts/packages/package-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ PKG_DIR="${PKG_REPO}/${PKG_NAME}"
PKG_REPO_URL="https://${PKG_DIR}"

APK=(
alpine/v3.22/main/aarch64/nginx-agent-$VERSION.apk
alpine/v3.22/main/x86_64/nginx-agent-$VERSION.apk
alpine/v3.21/main/aarch64/nginx-agent-$VERSION.apk
alpine/v3.21/main/x86_64/nginx-agent-$VERSION.apk
alpine/v3.20/main/aarch64/nginx-agent-$VERSION.apk
Expand Down Expand Up @@ -81,7 +83,6 @@ AMZN=(
)
SUSE=(
sles/15/x86_64/RPMS/nginx-agent-$VERSION.sles15.ngx.x86_64.rpm
sles/12/x86_64/RPMS/nginx-agent-$VERSION.sles12.ngx.x86_64.rpm
)
CENTOS=(
centos/9/aarch64/RPMS/nginx-agent-$VERSION.el9.ngx.aarch64.rpm
Expand Down Expand Up @@ -156,4 +157,4 @@ check_repo() {
}

check_repo
check_pkgs
check_pkgs
5 changes: 3 additions & 2 deletions test/docker/nginx-oss/deb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ COPY ./build /agent/build
COPY $ENTRY_POINT /agent/entrypoint.sh

RUN set -x \
&& addgroup --system --gid 101 nginx \
&& adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
&& ls /usr/sbin/ \
&& groupadd --system --gid 101 nginx \
&& useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
&& apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y ca-certificates \
gnupg2 \
Expand Down