Skip to content

Commit

Permalink
[frontendproxy] image packaging (#516)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
puckpuck authored Oct 22, 2022
1 parent 51ec243 commit 541dae3
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FRONTEND_ADDR=frontend:${FRONTEND_PORT}

# Envoy
FRONTEND_HOST=frontend
ENVOY_PORT=80
ENVOY_PORT=8080

# Redis
REDIS_PORT=6379
Expand Down
6 changes: 1 addition & 5 deletions .github/.mlc_config.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
11 changes: 5 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 2 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions docs/docker_deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/feature_flags.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 0 additions & 2 deletions src/frontendProxy/Dockerfile

This file was deleted.

6 changes: 6 additions & 0 deletions src/frontendproxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -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;"]
File renamed without changes.

0 comments on commit 541dae3

Please sign in to comment.