examples: Cleanups for docker compose (envoyproxy#20777)

- Update compose version `3.7` -> `3.8` - prevent base images from starting when running examples - remove unnecessary network configs Signed-off-by: Ryan Northey <[email protected]>
adisuissa · Apr 12, 2022 · 33d25b8 · 33d25b8
1 parent fcca74a
commit 33d25b8
Show file tree

Hide file tree

Showing 36 changed files with 78 additions and 75 deletions.
diff --git a/examples/brotli/docker-compose.yaml b/examples/brotli/docker-compose.yaml
@@ -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:

diff --git a/examples/cache/docker-compose.yaml b/examples/cache/docker-compose.yaml
@@ -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:

diff --git a/examples/cors/backend/docker-compose.yaml b/examples/cors/backend/docker-compose.yaml
@@ -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:

diff --git a/examples/cors/frontend/docker-compose.yaml b/examples/cors/frontend/docker-compose.yaml
@@ -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:

diff --git a/examples/csrf/crosssite/docker-compose.yml b/examples/csrf/crosssite/docker-compose.yml
@@ -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:

diff --git a/examples/csrf/samesite/docker-compose.yml b/examples/csrf/samesite/docker-compose.yml
@@ -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:

diff --git a/examples/double-proxy/docker-compose.yaml b/examples/double-proxy/docker-compose.yaml
@@ -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:

diff --git a/examples/dynamic-config-cp/docker-compose.yaml b/examples/dynamic-config-cp/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   proxy:

diff --git a/examples/dynamic-config-fs/docker-compose.yaml b/examples/dynamic-config-fs/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   proxy:

diff --git a/examples/ext_authz/docker-compose.yaml b/examples/ext_authz/docker-compose.yaml
@@ -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:

diff --git a/examples/fault-injection/docker-compose.yaml b/examples/fault-injection/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
   envoy:
     build:
@@ -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: {}
diff --git a/examples/front-proxy/docker-compose.yaml b/examples/front-proxy/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   # base images
@@ -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:

diff --git a/examples/grpc-bridge/docker-compose-protos.yaml b/examples/grpc-bridge/docker-compose-protos.yaml
@@ -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

diff --git a/examples/grpc-bridge/docker-compose.yaml b/examples/grpc-bridge/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 
 services:
 

diff --git a/examples/gzip/docker-compose.yaml b/examples/gzip/docker-compose.yaml
@@ -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:

diff --git a/examples/jaeger-native-tracing/docker-compose.yaml b/examples/jaeger-native-tracing/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   # base images
@@ -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:

diff --git a/examples/jaeger-tracing/docker-compose.yaml b/examples/jaeger-tracing/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   # base images
@@ -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:

diff --git a/examples/load-reporting-service/docker-compose.yaml b/examples/load-reporting-service/docker-compose.yaml
@@ -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:

diff --git a/examples/local_ratelimit/docker-compose.yaml b/examples/local_ratelimit/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
   envoy-stat:
     build:

diff --git a/examples/locality-load-balancing/docker-compose.yaml b/examples/locality-load-balancing/docker-compose.yaml
@@ -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:

diff --git a/examples/lua/docker-compose.yaml b/examples/lua/docker-compose.yaml
@@ -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: {}
diff --git a/examples/mysql/docker-compose.yaml b/examples/mysql/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   proxy:

diff --git a/examples/postgres/docker-compose.yaml b/examples/postgres/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   proxy:

diff --git a/examples/redis/docker-compose.yaml b/examples/redis/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   proxy:

diff --git a/examples/skywalking-tracing/docker-compose.yaml b/examples/skywalking-tracing/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   # base images
@@ -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:

diff --git a/examples/tls-inspector/docker-compose.yaml b/examples/tls-inspector/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   tls-inspector:

diff --git a/examples/tls-sni/docker-compose.yaml b/examples/tls-sni/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   proxy:

diff --git a/examples/tls/docker-compose.yaml b/examples/tls/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   proxy-https-to-http:

diff --git a/examples/udp/docker-compose.yaml b/examples/udp/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   testing:

diff --git a/examples/vrp-litmus/docker-compose.yaml b/examples/vrp-litmus/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 services:
 
   vrp:
@@ -8,10 +8,5 @@ services:
     environment:
       ENVOY_EDGE_EXTRA_ARGS: ""
       ENVOY_ORIGIN_EXTRA_ARGS: ""
-    networks:
-    - envoymesh
     ports:
     - "10000:10000"
-
-networks:
-  envoymesh: {}