Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/root/start/sandboxes/front_proxy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Below you can see a graphic showing the docker compose deployment:

All incoming requests are routed via the front Envoy, which is acting as a reverse proxy sitting on
the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000`` by docker compose
(see :repo:`/examples/front-proxy/docker-compose.yml`). Moreover, notice
(see :repo:`/examples/front-proxy/docker-compose.yaml`). Moreover, notice
that all traffic routed by the front Envoy to the service containers is actually routed to the
service Envoys (routes setup in :repo:`/examples/front-proxy/front-envoy.yaml`). In turn the service
envoys route the request to the flask app via the loopback address (routes setup in
Expand Down
6 changes: 3 additions & 3 deletions docs/root/start/sandboxes/grpc_bridge.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ To build the Go gRPC service run::

$ pwd
envoy/examples/grpc-bridge
$ script/bootstrap
$ script/build
$ script/bootstrap.sh
$ script/build.sh

Note: ``build`` requires that your Envoy codebase (or a working copy thereof) is in ``$GOPATH/src/github.com/envoyproxy/envoy``.
Note: ``build.sh`` requires that your Envoy codebase (or a working copy thereof) is in ``$GOPATH/src/github.com/envoyproxy/envoy``.

Docker compose
~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion docs/root/start/sandboxes/jaeger_native_tracing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ only works on x86-64).

All incoming requests are routed via the front Envoy, which is acting as a reverse proxy
sitting on the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000``
by docker compose (see :repo:`/examples/jaeger-native-tracing/docker-compose.yml`). Notice that
by docker compose (see :repo:`/examples/jaeger-native-tracing/docker-compose.yaml`). Notice that
all Envoys are configured to collect request traces (e.g., http_connection_manager/config/tracing setup in
:repo:`/examples/jaeger-native-tracing/front-envoy-jaeger.yaml`) and setup to propagate the spans generated
by the Jaeger tracer to a Jaeger cluster (trace driver setup
Expand Down
2 changes: 1 addition & 1 deletion docs/root/start/sandboxes/jaeger_tracing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The three containers will be deployed inside a virtual network called ``envoymes

All incoming requests are routed via the front Envoy, which is acting as a reverse proxy
sitting on the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000``
by docker compose (see :repo:`/examples/jaeger-tracing/docker-compose.yml`). Notice that
by docker compose (see :repo:`/examples/jaeger-tracing/docker-compose.yaml`). Notice that
all Envoys are configured to collect request traces (e.g., http_connection_manager/config/tracing setup in
:repo:`/examples/jaeger-tracing/front-envoy-jaeger.yaml`) and setup to propagate the spans generated
by the Jaeger tracer to a Jaeger cluster (trace driver setup
Expand Down
2 changes: 1 addition & 1 deletion docs/root/start/sandboxes/zipkin_tracing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The three containers will be deployed inside a virtual network called ``envoymes

All incoming requests are routed via the front Envoy, which is acting as a reverse proxy
sitting on the edge of the ``envoymesh`` network. Port ``80`` is mapped to port ``8000``
by docker compose (see :repo:`/examples/zipkin-tracing/docker-compose.yml`). Notice that
by docker compose (see :repo:`/examples/zipkin-tracing/docker-compose.yaml`). Notice that
all Envoys are configured to collect request traces (e.g., http_connection_manager/config/tracing setup in
:repo:`/examples/zipkin-tracing/front-envoy-zipkin.yaml`) and setup to propagate the spans generated
by the Zipkin tracer to a Zipkin cluster (trace driver setup
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

front-envoy:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

front-envoy:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:
envoy:
build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.7'
version: "3.7"
services:

front-envoy:
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-bridge/Dockerfile-grpc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ FROM envoyproxy/envoy-dev:latest

RUN mkdir /var/log/envoy/
COPY ./bin/service /usr/local/bin/srv
COPY ./script/grpc_start /etc/grpc_start
COPY ./script/grpc_start.sh /etc/grpc_start
CMD /etc/grpc_start

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

python:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

front-envoy:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

front-envoy:
Expand Down
2 changes: 1 addition & 1 deletion examples/lua/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

proxy:
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.5'
version: "3.7"
services:

proxy:
Expand Down
2 changes: 1 addition & 1 deletion examples/redis/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

proxy:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.7"
services:

front-envoy:
Expand Down