Skip to content
This repository was archived by the owner on Mar 30, 2022. It is now read-only.

feat: nginx proxy for pdf service #875

Open
Cooryd wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: nginx proxy for pdf service #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cfbe74
feat: nginx proxy for pdf service
Jul 22, 2021
25a6cd8
refactor: remove comment
Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .nginx/nginx.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ http {
proxy_redirect http://${PREFIX}-localstack:4566/ http://localhost:4566/;
}

location /pdf {
rewrite /pdf/(.*) /$1 break;
proxy_pass http://${PREFIX}-pdf-service:4001/;
proxy_set_header Host $host;
}

location / {
proxy_pass http://${PREFIX}-client:80/;
proxy_set_header Host $host;
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ services:
- 8984:8984

editor-client:
image: liberoadmin/editor-client:${TAG-latest}
image: libero/editor-client:local

@NuclearRedeye NuclearRedeye Jul 22, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks breaking to me, as in if I was to do a fresh clone of the repo and then run docker-compose up it would fail as there isn't a container published under the libero name, nor a published local tag.

container_name: ${PREFIX-editor}-client
restart: unless-stopped
depends_on:
Expand Down Expand Up @@ -96,7 +96,6 @@ services:
- ARTICLE_STORE_PATH=http://${PREFIX-editor}-article-store:8080/articles/
- GENERATION_RESOURCES_PATH=http://nginx:80/api/v1/articles/
- PORT=4001
# TODO: UPDATE THESE VALUES TO BE MOCK SERVICE ENDPOINTS
- GENERATION_START_URL=http://editor-mock-service:1080/pdf-generation/start
- GENERATION_STATUS_URL=http://editor-mock-service:1080/pdf-generation/status
- GENERATION_API_KEY=mySuperSecretApiKey
Expand Down