Skip to content

Commit

Permalink
Add more detail to comment in nginx.conf
Browse files Browse the repository at this point in the history
  • Loading branch information
brian-nguyen committed Dec 24, 2018
1 parent 67c5efe commit b70fed9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ https:

# Run NGINX container in daemon mode
# KNOWN ISSUE: Docker for Mac/Windows runs in VM --network host will not work as expected
# Replace --network host with -p 80:80 and -p 443:443 when in development
.PHONY: nginx
nginx:
docker run -d --rm \
--name bumper_nginx \
-v $(PWD)/web:/usr/share/nginx/html \
-v $(PWD)/config/nginx.conf:/etc/nginx/nginx.conf \
-v $(PWD)/config/cert.pem:/etc/nginx/ssl/nginx.crt \
-v $(PWD)/config/key.pem:/etc/nginx/ssl/nginx.key \
# -p 80:80 \ # Development setting
--network host \ # Production setting
-p 80:80 \
-p 443:443 \
nginx:alpine

# Build and run Bumper in daemon mode
Expand Down
2 changes: 1 addition & 1 deletion config/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ http {
ssl_certificate /etc/nginx/ssl/nginx.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.key;

# KNOWN ISSUE - Docker for Mac/Windows runs in VM
# KNOWN ISSUE - Docker for Mac/Windows runs in VM --network host will not work as expected
# Change localhost below to your machine's IP
location / {
proxy_pass http://localhost:9090/;
Expand Down

0 comments on commit b70fed9

Please sign in to comment.