Skip to content

Commit 541dae3

Browse files
authored
[frontendproxy] image packaging (#516)
* top button goes to /feature * package frontendproxy image * set frontendproxy port to 8080 * use proxy url instead * use proxy url instead * use proxy url instead
1 parent 51ec243 commit 541dae3

File tree

9 files changed

+21
-25
lines changed

9 files changed

+21
-25
lines changed

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FRONTEND_ADDR=frontend:${FRONTEND_PORT}
1717

1818
# Envoy
1919
FRONTEND_HOST=frontend
20-
ENVOY_PORT=80
20+
ENVOY_PORT=8080
2121

2222
# Redis
2323
REDIS_PORT=6379

.github/.mlc_config.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"ignorePatterns": [
3-
{"pattern": "^http://localhost"},
4-
{"pattern": "^http://localhost:3000"},
5-
{"pattern": "^http://localhost:8089"},
6-
{"pattern": "^http://localhost:9090"},
7-
{"pattern": "^http://localhost:16686"},
3+
{"pattern": "^http://localhost:8080"},
84
{"pattern": "^https://calendar.google.com/calendar"}
95
],
106
"replacementPatterns": [

CONTRIBUTING.md

+5-6
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,11 @@ docker compose up -d
9191

9292
Once the images are built and containers are started you can access:
9393

94-
- Webstore: <http://localhost/>
95-
- Jaeger: <http://localhost:16686/>
96-
- Prometheus: <http://localhost:9090/>
97-
- Grafana: <http://localhost:3000/>
98-
- Feature Flags UI: <http://localhost/feature/>
99-
- Load Generator UI: <http://localhost:8089/>
94+
- Webstore: <http://localhost:8080/>
95+
- Jaeger: <http://localhost:8080/jaeger/ui/>
96+
- Grafana: <http://localhost:8080/grafana/>
97+
- Feature Flags UI: <http://localhost:8080/feature/>
98+
- Load Generator UI: <http://localhost:8080/loadgen//>
10099

101100
## Create Your First Pull Request
102101

docker-compose.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,11 @@ services:
211211
logging: *logging
212212

213213
frontendproxy:
214-
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontend-envoy
214+
image: ${IMAGE_NAME}:${IMAGE_VERSION}-frontendproxy
215215
build:
216216
context: ./
217-
dockerfile: ./src/frontendProxy/Dockerfile
217+
dockerfile: src/frontendproxy/Dockerfile
218218
container_name: frontend-proxy
219-
volumes:
220-
- ./src/frontendproxy/envoy.tmpl.yaml:/etc/envoy/envoy.tmpl.yaml
221219
ports:
222220
- "${ENVOY_PORT}:${ENVOY_PORT}"
223221
- 10000:10000
@@ -240,7 +238,6 @@ services:
240238
- featureflagservice
241239
- loadgenerator
242240
- grafana
243-
command: /bin/sh -c "envsubst < /etc/envoy/envoy.tmpl.yaml > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"
244241

245242
loadgenerator:
246243
image: ${IMAGE_NAME}:${IMAGE_VERSION}-loadgenerator

docs/docker_deployment.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ source. It may take more than 20 minutes to build if the flag is omitted.
3939

4040
Once the images are built and containers are started you can access:
4141

42-
- Webstore: <http://localhost/>
43-
- Grafana: <http://localhost/grafana/>
44-
- Feature Flags UI: <http://localhost/feature/>
45-
- Load Generator UI: <http://localhost/loadgen/>
46-
- Jaeger UI: <http://localhost/jaeger/ui/>
42+
- Webstore: <http://localhost:8080/>
43+
- Grafana: <http://localhost:8080/grafana/>
44+
- Feature Flags UI: <http://localhost:8080/feature/>
45+
- Load Generator UI: <http://localhost:8080/loadgen/>
46+
- Jaeger UI: <http://localhost:8080/jaeger/ui/>
4747

4848
## Bring your own backend
4949

docs/feature_flags.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This demo comes with several feature flags which can control failure conditions
44
in specific services. By default the flags are disabled. Using the Feature Flags
5-
UI <http://localhost:8081> you will be able to control the status of these
5+
UI <http://localhost:8080/feature> you will be able to control the status of these
66
feature flags.
77

88
| Feature Flag | Service(s) | Description |

src/frontendProxy/Dockerfile

-2
This file was deleted.

src/frontendproxy/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM envoyproxy/envoy-dev:8c202194ac6a2cb781eb6ce27d924b379b1e787f
2+
RUN apt-get update && apt-get install -y gettext-base && apt-get clean && rm -rf /var/lib/apt/lists/*
3+
4+
COPY ./src/frontendproxy/envoy.tmpl.yaml /etc/envoy/envoy.tmpl.yaml
5+
6+
ENTRYPOINT ["/bin/sh", "-c", "envsubst < /etc/envoy/envoy.tmpl.yaml > /etc/envoy/envoy.yaml && envoy -c /etc/envoy/envoy.yaml;"]
File renamed without changes.

0 commit comments

Comments
 (0)