Skip to content
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

examples: Cleanups for docker compose #20777

Merged
merged 1 commit into from
Apr 12, 2022
Merged

examples: Cleanups for docker compose #20777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion examples/brotli/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

envoy-stats:
build:
Expand Down
4 changes: 3 additions & 1 deletion examples/cache/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

front-envoy:
build:
Expand Down
4 changes: 3 additions & 1 deletion examples/cors/backend/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

front-envoy:
build:
Expand Down
4 changes: 3 additions & 1 deletion examples/cors/frontend/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

front-envoy:
build:
Expand Down
4 changes: 3 additions & 1 deletion examples/csrf/crosssite/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: '3.7'
version: '3.8'
services:

flask_service:
build:
context: ../../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

front-envoy:
build:
Expand Down
4 changes: 3 additions & 1 deletion examples/csrf/samesite/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: '3.7'
version: '3.8'
services:

flask_service:
build:
context: ../../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

front-envoy:
build:
Expand Down
4 changes: 3 additions & 1 deletion examples/double-proxy/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

proxy-frontend:
build:
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-config-cp/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

proxy:
Expand Down
2 changes: 1 addition & 1 deletion examples/dynamic-config-fs/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

proxy:
Expand Down
4 changes: 3 additions & 1 deletion examples/ext_authz/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

front-envoy:
build:
Expand Down
8 changes: 1 addition & 7 deletions 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: "3.7"
version: "3.8"
services:
envoy:
build:
Expand All @@ -7,15 +7,9 @@ services:
command: /usr/local/bin/envoy -c /etc/envoy.yaml
volumes:
- ./runtime:/srv/runtime
networks:
- envoymesh
ports:
- 9211:9211
backend:
image: kennethreitz/httpbin@sha256:2c7abc4803080c22928265744410173b6fea3b898872c01c5fd0f0f9df4a59fb
networks:
- envoymesh
ports:
- 8080:80
networks:
envoymesh: {}
6 changes: 5 additions & 1 deletion examples/front-proxy/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

# base images
Expand All @@ -7,12 +7,16 @@ services:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

tracing:
build:
context: ../shared/tracing
image: envoyproxy:tracing
restart: "no"
deploy:
replicas: 0

# front-proxy
front-envoy:
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-bridge/docker-compose-protos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"

# This is the conversion from a script to a dockerized version of the script
# https://github.com/envoyproxy/envoy/blob/main/examples/grpc-bridge/service/script/gen
Expand Down
2 changes: 1 addition & 1 deletion 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: "3.7"
version: "3.8"

services:

Expand Down
4 changes: 3 additions & 1 deletion examples/gzip/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

envoy-stats:
build:
Expand Down
6 changes: 5 additions & 1 deletion examples/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: "3.7"
version: "3.8"
services:

# base images
Expand All @@ -7,12 +7,16 @@ services:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

tracing:
build:
context: ../shared/tracing
image: envoyproxy:tracing
restart: "no"
deploy:
replicas: 0

# jaeger
front-envoy:
Expand Down
6 changes: 5 additions & 1 deletion 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: "3.7"
version: "3.8"
services:

# base images
Expand All @@ -7,12 +7,16 @@ services:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

tracing:
build:
context: ../shared/tracing
image: envoyproxy:tracing
restart: "no"
deploy:
replicas: 0

# jaeger
front-envoy:
Expand Down
4 changes: 3 additions & 1 deletion examples/load-reporting-service/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: '3.7'
version: '3.8'
services:

flask_service:
build:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

envoy:
build:
Expand Down
2 changes: 1 addition & 1 deletion examples/local_ratelimit/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:
envoy-stat:
build:
Expand Down
4 changes: 3 additions & 1 deletion examples/locality-load-balancing/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
version: "3.7"
version: "3.8"
services:

flask_service:
build:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

client-envoy:
build:
Expand Down
9 changes: 1 addition & 8 deletions examples/lua/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
version: "3.7"
version: "3.8"
services:

proxy:
build:
context: .
dockerfile: Dockerfile-proxy
networks:
- envoymesh
ports:
- "8000:8000"

web_service:
build:
context: .
dockerfile: Dockerfile-web-service
networks:
- envoymesh
ports:
- "8080:80"

networks:
envoymesh: {}
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.7"
version: "3.8"
services:

proxy:
Expand Down
2 changes: 1 addition & 1 deletion examples/postgres/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
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: "3.7"
version: "3.8"
services:

proxy:
Expand Down
6 changes: 5 additions & 1 deletion examples/skywalking-tracing/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

# base images
Expand All @@ -7,12 +7,16 @@ services:
context: ../shared/flask
image: flask_service:python-3.10-slim-bullseye
restart: "no"
deploy:
replicas: 0

tracing:
build:
context: ../shared/tracing
image: envoyproxy:tracing
restart: "no"
deploy:
replicas: 0

# Front envoy.
front-envoy:
Expand Down
2 changes: 1 addition & 1 deletion examples/tls-inspector/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

tls-inspector:
Expand Down
2 changes: 1 addition & 1 deletion examples/tls-sni/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

proxy:
Expand Down
2 changes: 1 addition & 1 deletion examples/tls/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

proxy-https-to-http:
Expand Down
2 changes: 1 addition & 1 deletion examples/udp/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

testing:
Expand Down
7 changes: 1 addition & 6 deletions examples/vrp-litmus/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"
services:

vrp:
Expand All @@ -8,10 +8,5 @@ services:
environment:
ENVOY_EDGE_EXTRA_ARGS: ""
ENVOY_ORIGIN_EXTRA_ARGS: ""
networks:
- envoymesh
ports:
- "10000:10000"

networks:
envoymesh: {}
Loading