File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed
test/docker/nginx-oss/deb Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ GOBIN ?= $$(go env GOPATH)/bin
2727# | suse | sle15 | |
2828# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
2929OS_RELEASE ?= ubuntu
30- OS_VERSION ?= 22 .04
30+ OS_VERSION ?= 24 .04
3131BASE_IMAGE = "docker.io/$(OS_RELEASE ) :$(OS_VERSION ) "
3232IMAGE_TAG = "agent_$(OS_RELEASE ) _$(OS_VERSION ) "
3333DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE ) /Dockerfile"
@@ -43,8 +43,8 @@ PROTO_DIR := proto
4343BINARY_NAME := nginx-agent
4444PROJECT_DIR = cmd/agent
4545PROJECT_FILE = main.go
46- COLLECTOR_PATH ?= /etc/nginx-agent/opentelemetry-collector-agent.yaml
47- MANIFEST_DIR ?= /var/lib/nginx-agent
46+ COLLECTOR_PATH ?= /opt/homebrew/ etc/nginx-agent/opentelemetry-collector-agent.yaml
47+ MANIFEST_DIR ?= /opt/homebrew/ var/lib/nginx-agent
4848DIRS = $(BUILD_DIR ) $(TEST_BUILD_DIR ) $(BUILD_DIR ) /$(DOCS_DIR ) $(BUILD_DIR ) /$(DOCS_DIR ) /$(PROTO_DIR )
4949$(shell mkdir -p $(DIRS))
5050
@@ -62,7 +62,7 @@ APK_PACKAGE := ./build/$(PACKAGE_NAME).apk
6262DEB_PACKAGE := ./build/$(PACKAGE_NAME ) .deb
6363RPM_PACKAGE := ./build/$(PACKAGE_NAME ) .rpm
6464
65- MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
65+ MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
6666MOCK_MANAGEMENT_PLANE_LOG_LEVEL ?= INFO
6767MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS ?= 127.0.0.1:0
6868MOCK_MANAGEMENT_PLANE_API_ADDRESS ?= 127.0.0.1:0
Original file line number Diff line number Diff line change @@ -12,8 +12,9 @@ COPY ./build /agent/build
1212COPY $ENTRY_POINT /agent/entrypoint.sh
1313
1414RUN set -x \
15- && addgroup --system --gid 101 nginx \
16- && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
15+ && ls /usr/sbin/ \
16+ && groupadd --system --gid 101 nginx \
17+ && useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
1718 && apt-get update \
1819 && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates \
1920 gnupg2 \
You can’t perform that action at this time.
0 commit comments