Skip to content

Commit e3f18d2

Browse files
committed
fix test
1 parent c8ffcd0 commit e3f18d2

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ GOBIN ?= $$(go env GOPATH)/bin
2727
# | suse | sle15 | |
2828
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
2929
OS_RELEASE ?= ubuntu
30-
OS_VERSION ?= 22.04
30+
OS_VERSION ?= 24.04
3131
BASE_IMAGE = "docker.io/$(OS_RELEASE):$(OS_VERSION)"
3232
IMAGE_TAG = "agent_$(OS_RELEASE)_$(OS_VERSION)"
3333
DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
@@ -43,8 +43,8 @@ PROTO_DIR := proto
4343
BINARY_NAME := nginx-agent
4444
PROJECT_DIR = cmd/agent
4545
PROJECT_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
4848
DIRS = $(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
6262
DEB_PACKAGE := ./build/$(PACKAGE_NAME).deb
6363
RPM_PACKAGE := ./build/$(PACKAGE_NAME).rpm
6464

65-
MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
65+
MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
6666
MOCK_MANAGEMENT_PLANE_LOG_LEVEL ?= INFO
6767
MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS ?= 127.0.0.1:0
6868
MOCK_MANAGEMENT_PLANE_API_ADDRESS ?= 127.0.0.1:0

test/docker/nginx-oss/deb/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ COPY ./build /agent/build
1212
COPY $ENTRY_POINT /agent/entrypoint.sh
1313

1414
RUN 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 \

0 commit comments

Comments
 (0)