fixes

.github/workflows/system-testing.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           pull: true
           load: true
-          file: Dockerfile-test
+          file: test/Dockerfile-test
           tags: nginx-opentracing-test/nginx
           cache-from: type=gha,scope=system-nginx
           cache-to: type=gha,scope=system-nginx,mode=max
@@ -76,7 +76,7 @@ jobs:
           python3 nginx_opentracing_test.py
         env:
           PYTHONPATH: environment/grpc
-          LOG_DIR: test-log
+          LOG_DIR: ${{ github.workspace }}/test-log
         working-directory: test
 
       - name: Upload artifact

.gitignore

@@ -41,3 +41,6 @@ test-log/
 .DS_Store
 
 out
+bin
+lib
+pyvenv.cfg

Makefile

@@ -1,3 +1,5 @@
+NGINX_VERSION=1.27.0
+
 .PHONY: docker-image
 docker-image:
 	docker build -f Dockerfile -t opentracing-contrib/nginx-opentracing --target final .
@@ -7,11 +9,14 @@ docker-image-alpine:
 	docker build -f Dockerfile -t opentracing-contrib/nginx-opentracing --target final --build-arg BUILD_OS=alpine .
 
 docker-build-binaries:
-	docker buildx build --build-arg NGINX_VERSION=1.27.0 --platform linux/amd64 -f build/Dockerfile -t nginx-opentracing-binaries --target=export --output "type=local,dest=out" --progress=plain --no-cache --pull .
+	docker buildx build --build-arg NGINX_VERSION=$(NGINX_VERSION) --platform linux/amd64 -f build/Dockerfile -t nginx-opentracing-binaries --target=export --output "type=local,dest=out" --progress=plain --no-cache --pull .
 
 .PHONY: test
 test:
-	./ci/system_testing.sh
+	docker build -t nginx-opentracing-test/nginx -f test/Dockerfile-test . --build-arg NGINX_VERSION=$(NGINX_VERSION)
+	docker build -t nginx-opentracing-test/backend -f test/Dockerfile-backend ./test
+	docker build -t nginx-opentracing-test/grpc-backend -f test/environment/grpc/Dockerfile ./test/environment/grpc
+	cd test && LOG_DIR=$(CURDIR)/test/test-log PYTHONPATH=environment/grpc python3 nginx_opentracing_test.py
 
 .PHONY: clean
 clean:

Dockerfile-test → test/Dockerfile-test

@@ -1,7 +1,7 @@
 FROM ubuntu:24.04
 
 ARG OPENTRACING_CPP_VERSION=v1.6.0
-ARG NGINX_VERSION=1.27.0
+ARG NGINX_VERSION
 
 RUN set -x \
   && apt-get update \

test/environment/docker-compose.yaml

@@ -1,4 +1,3 @@
-version: '3'
 services:
 
   nginx:
@@ -44,7 +43,7 @@ services:
       - "5001:5001"
 
   php_fpm:
-    image: php:7-fpm
+    image: php:8-fpm
     networks:
       testnet:
         aliases: