Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Catch up main to canary #62

Merged
merged 5 commits into from
Aug 20, 2024
Merged

Catch up main to canary #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd9f926
Hardcode upgrade header for nginx
killion Aug 15, 2024
055a732
Expose ports 4000 and 5000 for optional nginx bypass
killion Aug 15, 2024
e78b3cb
Merge remote-tracking branch 'upstream/main' into allow-nginx-to-use-…
killion Aug 15, 2024
8a61df6
Merge pull request #57 from killion/allow-nginx-to-use-http-1.1
driaug Aug 20, 2024
c6c7a53
Merge pull request #61 from useplunk/main
driaug Aug 20, 2024
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ COPY deployment/entry.sh deployment/replace-variables.sh /app/

RUN chmod +x /app/entry.sh /app/replace-variables.sh

EXPOSE 3000
EXPOSE 3000 4000 5000

CMD ["sh", "/app/entry.sh"]
6 changes: 6 additions & 0 deletions deployment/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ http {
location /api/ {
proxy_pass http://127.0.0.1:4000/;
proxy_set_header Host $host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
Expand All @@ -17,6 +20,9 @@ http {
location / {
proxy_pass http://127.0.0.1:5000;
proxy_set_header Host $host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
Expand Down
Loading