File tree Expand file tree Collapse file tree 2 files changed +14
-7
lines changed Expand file tree Collapse file tree 2 files changed +14
-7
lines changed Original file line number Diff line number Diff line change @@ -11,23 +11,23 @@ docker-build:
1111
1212run-nginx-plus :
1313 docker network create --driver bridge test
14- docker run --network=test -d --name nginx-plus-test --network-alias=nginx-plus-test --rm -p 8080:8080 -p 8081:8081 $(NGINX_IMAGE )
15- docker run --network=test -d --name nginx-plus-test- helper --network-alias=nginx-plus-test --rm -p 8090:8080 -p 8091:8081 $(NGINX_IMAGE )
14+ docker run --network=test -d --name nginx-plus --network-alias=nginx-plus-test --rm -p 8080:8080 -p 8081:8081 $(NGINX_IMAGE )
15+ docker run --network=test -d --name nginx-plus-helper --network-alias=nginx-plus-test --rm -p 8090:8080 -p 8091:8081 $(NGINX_IMAGE )
1616
1717test-run :
1818 go test client/*
1919 go clean -testcache
2020 go test tests/client_test.go
2121
2222configure-no-stream-block :
23- docker cp docker/nginx_no_stream.conf nginx-plus-test :/etc/nginx/nginx.conf
24- docker exec nginx-plus-test nginx -s reload
23+ docker cp docker/nginx_no_stream.conf nginx-plus:/etc/nginx/nginx.conf
24+ docker exec nginx-plus nginx -s reload
2525
2626test-run-no-stream-block :
2727 go clean -testcache
2828 go test tests/client_no_stream_test.go
2929
3030clean :
31- -docker kill nginx-plus-test
32- -docker kill nginx-plus-test- helper
33- -docker network rm test
31+ -docker kill nginx-plus
32+ -docker kill nginx-plus-helper
33+ -docker network rm test
Original file line number Diff line number Diff line change 1+ node {
2+ git(
3+ url : " ${ libsLocation} " ,
4+ credentialsId : " ${ githubCreds} "
5+ )
6+ load ' nginx-plus-go-client/Jenkinsfile'
7+ }
You can’t perform that action at this time.
0 commit comments