Copy configs into example images

examples/BUILD

@@ -14,9 +14,14 @@ filegroup(
         "cors/backend/service-envoy.yaml",
         "cors/frontend/front-envoy.yaml",
         "cors/frontend/service-envoy.yaml",
+        "csrf/crosssite/front-envoy.yaml",
+        "csrf/samesite/front-envoy.yaml",
+        "csrf/service-envoy.yaml",
         "ext_authz/config/grpc-service/v2.yaml",
         "ext_authz/config/grpc-service/v3.yaml",
         "ext_authz/config/http-service.yaml",
+        "ext_authz/config/opa-service/v2.yaml",
+        "fault-injection/envoy.yaml",
         "front-proxy/front-envoy.yaml",
         "front-proxy/service-envoy.yaml",
         "grpc-bridge/client/envoy-proxy.yaml",
@@ -27,6 +32,8 @@ filegroup(
         "load-reporting-service/service-envoy-w-lrs.yaml",
         "lua/envoy.yaml",
         "lua/lib/mylibrary.lua",
+        "mysql/envoy.yaml",
+        "redis/envoy.yaml",
         "zipkin-tracing/front-envoy-zipkin.yaml",
         "zipkin-tracing/service1-envoy-zipkin.yaml",
         "zipkin-tracing/service2-envoy-zipkin.yaml",

examples/cors/backend/Dockerfile-frontenvoy

@@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest
 
 RUN apt-get update && apt-get -q install -y \
     curl
+COPY ./front-envoy.yaml /etc/front-envoy.yaml
+RUN chmod go+r /etc/front-envoy.yaml
 CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy

examples/cors/backend/docker-compose.yaml

@@ -5,8 +5,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-frontenvoy
-    volumes:
-      - ./front-envoy.yaml:/etc/front-envoy.yaml
     networks:
       - envoymesh
     expose:

examples/cors/frontend/Dockerfile-frontenvoy

@@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest
 
 RUN apt-get update && apt-get -q install -y \
     curl
+COPY ./front-envoy.yaml /etc/front-envoy.yaml
+RUN chmod go+r /etc/front-envoy.yaml
 CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy

examples/cors/frontend/docker-compose.yaml

@@ -5,8 +5,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-frontenvoy
-    volumes:
-      - ./front-envoy.yaml:/etc/front-envoy.yaml
     networks:
       - envoymesh
     expose:

examples/csrf/Dockerfile-frontenvoy → examples/csrf/crosssite/Dockerfile-frontenvoy

@@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest
 
 RUN apt-get update && apt-get -q install -y \
     curl
+COPY ./front-envoy.yaml /etc/front-envoy.yaml
+RUN chmod go+r /etc/front-envoy.yaml
 CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy

examples/csrf/crosssite/docker-compose.yml

@@ -3,10 +3,8 @@ services:
 
   front-envoy:
     build:
-      context: ..
+      context: .
       dockerfile: Dockerfile-frontenvoy
-    volumes:
-      - ./front-envoy.yaml:/etc/front-envoy.yaml
     networks:
       - envoymesh
     expose:

examples/csrf/crosssite/front-envoy.yaml

@@ -15,7 +15,7 @@ static_resources:
             - name: envoy.access_loggers.file
               typed_config:
                 "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
-                path: "/var/log/access.log"
+                path: "/dev/stdout"
           route_config:
             name: local_route
             virtual_hosts:

examples/csrf/samesite/Dockerfile-frontenvoy

@@ -0,0 +1,7 @@
+FROM envoyproxy/envoy-dev:latest
+
+RUN apt-get update && apt-get -q install -y \
+    curl
+COPY ./front-envoy.yaml /etc/front-envoy.yaml
+RUN chmod go+r /etc/front-envoy.yaml
+CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy

examples/csrf/samesite/docker-compose.yml

@@ -3,10 +3,8 @@ services:
 
   front-envoy:
     build:
-      context: ..
+      context: .
       dockerfile: Dockerfile-frontenvoy
-    volumes:
-      - ./front-envoy.yaml:/etc/front-envoy.yaml
     networks:
       - envoymesh
     expose:

examples/csrf/samesite/front-envoy.yaml

@@ -15,22 +15,25 @@ static_resources:
             - name: envoy.access_loggers.file
               typed_config:
                 "@type": type.googleapis.com/envoy.config.accesslog.v2.FileAccessLog
-                path: "/var/log/access.log"
+                path: "/dev/stdout"
           route_config:
             name: local_route
             virtual_hosts:
             - name: www
               domains:
               - "*"
               cors:
-                allow_origin:
-                - "*"
+                allow_origin_string_match:
+                - safe_regex:
+                    google_re2: {}
+                    regex: \*
                 filter_enabled:
                   default_value:
                     numerator: 100
                     denominator: HUNDRED
-              per_filter_config:
+              typed_per_filter_config:
                 envoy.filters.http.csrf:
+                  "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy
                   filter_enabled:
                     default_value:
                       numerator: 100
@@ -46,8 +49,9 @@ static_resources:
                   prefix: "/csrf/disabled"
                 route:
                   cluster: generic_service
-                per_filter_config:
+                typed_per_filter_config:
                   envoy.filters.http.csrf:
+                    "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy
                     filter_enabled:
                       default_value:
                         numerator: 0
@@ -56,8 +60,9 @@ static_resources:
                   prefix: "/csrf/shadow"
                 route:
                   cluster: generic_service
-                per_filter_config:
+                typed_per_filter_config:
                   envoy.filters.http.csrf:
+                    "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy
                     filter_enabled:
                       default_value:
                         numerator: 0
@@ -70,14 +75,17 @@ static_resources:
                   prefix: "/csrf/additional_origin"
                 route:
                   cluster: generic_service
-                per_filter_config:
+                typed_per_filter_config:
                   envoy.filters.http.csrf:
+                    "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy
                     filter_enabled:
                       default_value:
                         numerator: 100
                         denominator: HUNDRED
                     additional_origins:
-                    - regex: .*
+                    - safe_regex:
+                        google_re2: {}
+                        regex: .*
               - match:
                   prefix: "/"
                 route:
@@ -86,7 +94,8 @@ static_resources:
           - name: envoy.filters.http.cors
             typed_config: {}
           - name: envoy.filters.http.csrf
-            config:
+            typed_config:
+              "@type": type.googleapis.com/envoy.extensions.filters.http.csrf.v3.CsrfPolicy
               filter_enabled:
                 default_value:
                   numerator: 0

examples/ext_authz/Dockerfile-frontenvoy

@@ -0,0 +1,9 @@
+FROM envoyproxy/envoy-dev:latest
+
+RUN apt-get update && apt-get -q install -y \
+    curl
+COPY ./config /etc/envoy-config
+COPY ./run_envoy.sh /run_envoy.sh
+RUN chmod go+r -R /etc/envoy-config \
+    && chmod go+rx /run_envoy.sh /etc/envoy-config /etc/envoy-config/*
+CMD /run_envoy.sh

examples/ext_authz/docker-compose.yaml

@@ -3,10 +3,10 @@ services:
 
   front-envoy:
     build:
-      context: ../
-      dockerfile: front-proxy/Dockerfile-frontenvoy
-    volumes:
-      - ./${FRONT_ENVOY_YAML}:/etc/front-envoy.yaml
+      context: .
+      dockerfile: Dockerfile-frontenvoy
+    environment:
+      - FRONT_ENVOY_YAML
     networks:
       - envoymesh
     expose:

examples/ext_authz/run_envoy.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/local/bin/envoy -c "/etc/envoy-${FRONT_ENVOY_YAML}" --service-cluster front-proxy

examples/fault-injection/Dockerfile-envoy

@@ -1,4 +1,6 @@
 FROM envoyproxy/envoy-dev:latest
 
 RUN apt-get update && apt-get install -y curl tree
+COPY ./envoy.yaml /etc/envoy.yaml
+RUN chmod go+r /etc/envoy.yaml
 COPY enable_delay_fault_injection.sh disable_delay_fault_injection.sh enable_abort_fault_injection.sh disable_abort_fault_injection.sh send_request.sh /

examples/fault-injection/docker-compose.yaml

@@ -6,7 +6,6 @@ services:
       dockerfile: Dockerfile-envoy
     command: /usr/local/bin/envoy -c /etc/envoy.yaml
     volumes:
-      - ./envoy.yaml:/etc/envoy.yaml
       - ./runtime:/srv/runtime
     networks:
       - envoymesh

examples/fault-injection/envoy.yaml

@@ -63,6 +63,9 @@ admin:
     socket_address:
       address: 0.0.0.0
       port_value: 9901
-runtime:
-  symlink_root: /srv/runtime/current
-  subdirectory: envoy
+layered_runtime:
+  layers:
+  - name: disk_layer_0
+    disk_layer:
+      symlink_root: /srv/runtime/current
+      subdirectory: envoy

examples/front-proxy/Dockerfile-frontenvoy

@@ -2,4 +2,6 @@ FROM envoyproxy/envoy-dev:latest
 
 RUN apt-get update && apt-get -q install -y \
     curl
+COPY ./front-envoy.yaml /etc/front-envoy.yaml
+RUN chmod go+r /etc/front-envoy.yaml
 CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy

examples/front-proxy/docker-compose.yaml

@@ -5,8 +5,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-frontenvoy
-    volumes:
-      - ./front-envoy.yaml:/etc/front-envoy.yaml
     networks:
       - envoymesh
     expose:

examples/grpc-bridge/Dockerfile-client

@@ -0,0 +1,5 @@
+FROM envoyproxy/envoy-dev:latest
+
+COPY ./client/envoy-proxy.yaml /etc/client-envoy-proxy.yaml
+RUN chmod go+r /etc/client-envoy-proxy.yaml
+CMD /usr/local/bin/envoy -c /etc/client-envoy-proxy.yaml

examples/grpc-bridge/Dockerfile-server

@@ -0,0 +1,5 @@
+FROM envoyproxy/envoy-dev:latest
+
+COPY ./server/envoy-proxy.yaml /etc/server-envoy-proxy.yaml
+RUN chmod go+r /etc/server-envoy-proxy.yaml
+CMD /usr/local/bin/envoy -c /etc/server-envoy-proxy.yaml --service-cluster backend-proxy

examples/grpc-bridge/docker-compose.yaml

@@ -17,10 +17,9 @@ services:
           - kv-backend-service
 
   grpc-server-proxy:
-    image: envoyproxy/envoy:latest
-    command: /usr/local/bin/envoy -c /etc/server-envoy-proxy.yaml --service-cluster backend-proxy
-    volumes:
-      - ./server/envoy-proxy.yaml:/etc/server-envoy-proxy.yaml
+    build:
+      context: .
+      dockerfile: Dockerfile-server
     networks:
       envoymesh:
         aliases:
@@ -45,10 +44,9 @@ services:
           - grpc-client
 
   grpc-client-proxy:
-    image: envoyproxy/envoy:latest
-    command: /usr/local/bin/envoy -c /etc/client-envoy-proxy.yaml
-    volumes:
-      - ./client/envoy-proxy.yaml:/etc/client-envoy-proxy.yaml
+    build:
+      context: .
+      dockerfile: Dockerfile-client
     networks:
       envoymesh:
         aliases:

examples/jaeger-native-tracing/Dockerfile-frontenvoy

@@ -0,0 +1,17 @@
+FROM envoyproxy/envoy-dev:latest
+
+RUN apt-get update && apt-get -q install -y \
+    curl
+COPY ./front-envoy-jaeger.yaml /etc/front-envoy.yaml
+#
+# for discussion on jaeger binary compatibility, and the source of the file, see here:
+#  https://github.com/envoyproxy/envoy/issues/11382#issuecomment-638012072
+#
+RUN echo "4a7d17d4724ee890490bcd6cfdedb12a02316a3d33214348d30979abd201f1ca /usr/local/lib/libjaegertracing_plugin.so" > /tmp/checksum \
+         && curl -Ls https://github.com/tetratelabs/getenvoy-package/files/3518103/getenvoy-centos-jaegertracing-plugin.tar.gz \
+              | tar zxf - -C /usr/local/lib \
+         && mv /usr/local/lib/libjaegertracing.so.0.4.2 /usr/local/lib/libjaegertracing_plugin.so \
+         && sha256sum -c /tmp/checksum \
+         && rm /tmp/checksum \
+	 && chmod go+r /etc/front-envoy.yaml
+CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy

examples/jaeger-native-tracing/docker-compose.yaml

@@ -3,13 +3,8 @@ services:
 
   front-envoy:
     build:
-      context: ../
-      dockerfile: front-proxy/Dockerfile-frontenvoy
-    volumes:
-      - ./front-envoy-jaeger.yaml:/etc/front-envoy.yaml
-      - ./install-jaeger-plugin.sh:/install-jaeger-plugin.sh
-      - ./start-front.sh:/start-front.sh
-    entrypoint: /start-front.sh
+      context: .
+      dockerfile: Dockerfile-frontenvoy
     networks:
       - envoymesh
     expose:
@@ -28,9 +23,7 @@ services:
       dockerfile: Dockerfile-service
     volumes:
       - ./service1-envoy-jaeger.yaml:/etc/service-envoy.yaml
-      - ./install-jaeger-plugin.sh:/install-jaeger-plugin.sh
-      - ./start-service.sh:/start-service.sh
-    entrypoint: /start-service.sh
+      - ./libjaegertracing.so.0.4.2:/usr/local/lib/libjaegertracing_plugin.so
     networks:
       envoymesh:
         aliases:
@@ -49,9 +42,7 @@ services:
       dockerfile: Dockerfile-service
     volumes:
       - ./service2-envoy-jaeger.yaml:/etc/service-envoy.yaml
-      - ./install-jaeger-plugin.sh:/install-jaeger-plugin.sh
-      - ./start-service.sh:/start-service.sh
-    entrypoint: /start-service.sh
+      - ./libjaegertracing.so.0.4.2:/usr/local/lib/libjaegertracing_plugin.so
     networks:
       envoymesh:
         aliases:

examples/jaeger-tracing/Dockerfile-frontenvoy

@@ -0,0 +1,7 @@
+FROM envoyproxy/envoy-dev:latest
+
+RUN apt-get update && apt-get -q install -y \
+    curl
+COPY ./front-envoy-jaeger.yaml /etc/front-envoy.yaml
+RUN chmod go+r /etc/front-envoy.yaml
+CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy

examples/jaeger-tracing/docker-compose.yaml

@@ -3,10 +3,8 @@ services:
 
   front-envoy:
     build:
-      context: ../
-      dockerfile: front-proxy/Dockerfile-frontenvoy
-    volumes:
-      - ./front-envoy-jaeger.yaml:/etc/front-envoy.yaml
+      context: .
+      dockerfile: Dockerfile-frontenvoy
     networks:
       - envoymesh
     expose:

examples/lua/Dockerfile-proxy

@@ -1,3 +1,5 @@
 FROM envoyproxy/envoy-dev:latest
 ADD ./lib/mylibrary.lua /lib/mylibrary.lua
+COPY ./envoy.yaml /etc/envoy.yaml
+RUN chmod go+r /etc/envoy.yaml /lib/mylibrary.lua
 CMD /usr/local/bin/envoy -c /etc/envoy.yaml -l debug --service-cluster proxy

examples/lua/docker-compose.yaml

@@ -5,8 +5,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-proxy
-    volumes:
-      - ./envoy.yaml:/etc/envoy.yaml
     networks:
       - envoymesh
     expose: