Skip to content

examples: standardize docker-compose version and yaml extension #6613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 4 commits into from
Apr 18, 2019
Merged

examples: standardize docker-compose version and yaml extension #6613

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a16999d
Standardize docker-compose version and yaml extension
cpaika Apr 17, 2019
9261c2a
changing the build script name to be consistent with documentation
cpaika Apr 17, 2019
9c6b88a
Responding to PR comments
cpaika Apr 17, 2019
475dfe4
Standardizing .sh extensions
cpaika Apr 17, 2019
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion docs/root/start/sandboxes/jaeger_native_tracing.rst
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion examples/cors/backend/docker-compose.yml → examples/cors/backend/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3.7'

@moderation moderation Apr 17, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit. I didn't mention this on my comment on the prior issue but for consistency with quoting in YAML files can you also change the quoting here from single quote to double quote. ie "3.7". Same for the other occurrences.

@cpaika cpaika Apr 17, 2019

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, will update thanks 👍

services:

front-envoy:
Expand Down
2 changes: 1 addition & 1 deletion examples/cors/frontend/docker-compose.yml → examples/cors/frontend/docker-compose.yaml
View file
Open in desktop
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/fault-injection/docker-compose.yml → examples/fault-injection/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3.7'
services:
envoy:
build:
Expand Down
0 examples/front-proxy/docker-compose.yml → examples/front-proxy/docker-compose.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/grpc-bridge/docker-compose.yml → examples/grpc-bridge/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3.7'
services:

python:
Expand Down
0 examples/grpc-bridge/script/build.sh → examples/grpc-bridge/script/build
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../jaeger-native-tracing/docker-compose.yml → ...jaeger-native-tracing/docker-compose.yaml
View file
Open in desktop
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/jaeger-tracing/docker-compose.yml → examples/jaeger-tracing/docker-compose.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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/zipkin-tracing/docker-compose.yml → examples/zipkin-tracing/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3.7'
services:

front-envoy:
Expand Down