[frontendproxy] image packaging

.env

@@ -17,7 +17,7 @@ FRONTEND_ADDR=frontend:${FRONTEND_PORT}
 
 # Envoy
 FRONTEND_HOST=frontend
-ENVOY_PORT=80
+ENVOY_PORT=8080
 
 # Redis
 REDIS_PORT=6379

.github/.mlc_config.json

@@ -1,10 +1,6 @@
 {
     "ignorePatterns": [
-        {"pattern": "^http://localhost"},
-        {"pattern": "^http://localhost:3000"},
-        {"pattern": "^http://localhost:8089"},
-        {"pattern": "^http://localhost:9090"},
-        {"pattern": "^http://localhost:16686"},
+        {"pattern": "^http://localhost:8080"},
         {"pattern": "^https://calendar.google.com/calendar"}
     ],
     "replacementPatterns": [

CONTRIBUTING.md

@@ -91,12 +91,11 @@ docker compose up -d
 
 Once the images are built and containers are started you can access:
 
-- Webstore: <http://localhost/>
-- Jaeger: <http://localhost:16686/>
-- Prometheus: <http://localhost:9090/>
-- Grafana: <http://localhost:3000/>
-- Feature Flags UI: <http://localhost/feature/>
-- Load Generator UI: <http://localhost:8089/>
+- Webstore: <http://localhost:8080/>
+- Jaeger: <http://localhost:8080/jaeger/ui/>
+- Grafana: <http://localhost:8080/grafana/>
+- Feature Flags UI: <http://localhost:8080/feature/>
+- Load Generator UI: <http://localhost:8080/loadgen//>
 
 ## Create Your First Pull Request
 

docker-compose.yml

@@ -211,13 +211,11 @@ services:
     logging: *logging
 
   frontendproxy:
-    image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend-envoy
+    image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
     build:
       context: ./
-      dockerfile: ./src/frontendProxy/Dockerfile
+      dockerfile: src/frontendproxy/Dockerfile
     container_name: frontend-proxy
-    volumes:
-      - ./src/frontendproxy/envoy.tmpl.yaml:/etc/envoy/envoy.tmpl.yaml
     ports:
       - "${ENVOY_PORT}:${ENVOY_PORT}"
       - 10000:10000
@@ -240,7 +238,6 @@ services:
       - featureflagservice
       - loadgenerator
       - grafana
-    command: /bin/sh -c "envsubst < /etc/envoy/envoy.tmpl.yaml > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"
 
   loadgenerator:
     image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator

docs/docker_deployment.md

@@ -39,11 +39,11 @@ source. It may take more than 20 minutes to build if the flag is omitted.
 
 Once the images are built and containers are started you can access:
 
-- Webstore: <http://localhost/>
-- Grafana: <http://localhost/grafana/>
-- Feature Flags UI: <http://localhost/feature/>
-- Load Generator UI: <http://localhost/loadgen/>
-- Jaeger UI: <http://localhost/jaeger/ui/>
+- Webstore: <http://localhost:8080/>
+- Grafana: <http://localhost:8080/grafana/>
+- Feature Flags UI: <http://localhost:8080/feature/>
+- Load Generator UI: <http://localhost:8080/loadgen/>
+- Jaeger UI: <http://localhost:8080/jaeger/ui/>
 
 ## Bring your own backend
 

docs/feature_flags.md

@@ -2,7 +2,7 @@
 
 This demo comes with several feature flags which can control failure conditions
 in specific services. By default the flags are disabled. Using the Feature Flags
-UI <http://localhost:8081> you will be able to control the status of these
+UI <http://localhost:8080/feature> you will be able to control the status of these
 feature flags.
 
 | Feature Flag            | Service(s)      | Description                                                               |

src/frontendproxy/Dockerfile

@@ -0,0 +1,6 @@
+FROM envoyproxy/envoy-dev:8c202194ac6a2cb781eb6ce27d924b379b1e787f
+RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+COPY ./src/frontendproxy/envoy.tmpl.yaml /etc/envoy/envoy.tmpl.yaml
+
+ENTRYPOINT ["/bin/sh", "-c", "envsubst < /etc/envoy/envoy.tmpl.yaml > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"]