Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Abingcbc committed Nov 26, 2024
1 parent d932019 commit 4883fbd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion core/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ macro(link_spl target_name)

find_library(LIB_FOUND "libloongcollector_spl.a")
if (NOT LIB_FOUND)
message(FATAL_ERROR "Please upgrade your development image to compile SPL feature!")
message(FATAL_ERROR "Please upgrade your development image to compile!")
endif()

target_link_libraries(${target_name} "libloongcollector_spl.a")
Expand Down
8 changes: 6 additions & 2 deletions docker/Dockerfile.e2e-test
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
FROM python:3.8
FROM golang:1.19.10

RUN mkdir -p /tmp/loongcollector

WORKDIR /root
COPY . ./loongcollector

RUN apt-get update
RUN apt-get -y install python3-setuptools
RUN apt-get -y install python3-pip

WORKDIR /root/loongcollector/test
RUN pip3 install -r requirements.txt
RUN pip3 install -r requirements.txt --break-system-packages

CMD ["sh", "-c", "while true; do sleep 3600; done"]
7 changes: 6 additions & 1 deletion test/engine/setup/docker_compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,12 @@ func (d *DockerComposeEnv) Clean() error {
}

func (d *DockerComposeEnv) ExecOnLogtail(command string) (string, error) {
return "", fmt.Errorf("not implemented")
// exec on host of docker compose
fmt.Println(command)
cmd := exec.Command("sh", "-c", command)
output, err := cmd.CombinedOutput()
fmt.Println(string(output))
return string(output), err
}

func (d *DockerComposeEnv) ExecOnSource(ctx context.Context, command string) (string, error) {
Expand Down

0 comments on commit 4883fbd

Please sign in to comment.