mirror of https://github.com/grpc/grpc-web.git
Fixing Envoy config yaml formatting (#1223)
This commit is contained in:
parent
58e8c1574f
commit
c6ef0a55b6
|
@ -66,12 +66,12 @@ static_resources:
|
||||||
name: local_route
|
name: local_route
|
||||||
virtual_hosts:
|
virtual_hosts:
|
||||||
- name: local_service
|
- name: local_service
|
||||||
domains: [ "*" ]
|
domains: ["*"]
|
||||||
routes:
|
routes:
|
||||||
- match: { prefix: "/" }
|
- match: { prefix: "/" }
|
||||||
route:
|
route:
|
||||||
cluster: echo_service
|
cluster: echo_service
|
||||||
max_grpc_timeout: 0s
|
timeout: 0s
|
||||||
http_filters:
|
http_filters:
|
||||||
- name: envoy.filters.http.grpc_web
|
- name: envoy.filters.http.grpc_web
|
||||||
typed_config:
|
typed_config:
|
||||||
|
|
|
@ -34,6 +34,15 @@ do
|
||||||
{ echo >&2 "$p is required but not installed. Aborting."; exit 1; }
|
{ echo >&2 "$p is required but not installed. Aborting."; exit 1; }
|
||||||
done
|
done
|
||||||
|
|
||||||
|
function cleanup () {
|
||||||
|
echo "Killing lingering Docker servers..."
|
||||||
|
docker rm -f "$pid1"
|
||||||
|
docker rm -f "$pid2"
|
||||||
|
docker rm -f "$pid3"
|
||||||
|
}
|
||||||
|
|
||||||
|
trap cleanup EXIT
|
||||||
|
|
||||||
# Build all relevant docker images. They should all build successfully.
|
# Build all relevant docker images. They should all build successfully.
|
||||||
docker-compose build prereqs node-interop-server java-interop-server
|
docker-compose build prereqs node-interop-server java-interop-server
|
||||||
|
|
||||||
|
@ -57,7 +66,9 @@ docker rm -f "$pid2"
|
||||||
##########################################################
|
##########################################################
|
||||||
echo -e "\n[Running] Interop test #2 - against Java interop server"
|
echo -e "\n[Running] Interop test #2 - against Java interop server"
|
||||||
pid3=$(docker run -d --network=host grpcweb/java-interop-server)
|
pid3=$(docker run -d --network=host grpcweb/java-interop-server)
|
||||||
|
|
||||||
run_tests
|
run_tests
|
||||||
|
|
||||||
docker rm -f "$pid3"
|
docker rm -f "$pid3"
|
||||||
|
|
||||||
# Clean up
|
# Clean up
|
||||||
|
|
Loading…
Reference in New Issue