Revert "fix(docker): use a tunable for fastapi proxy host value"

This reverts commit 32b4f75f01.
This commit is contained in:
Kevin Morris 2022-01-15 18:13:14 -08:00
parent 32b4f75f01
commit 377bf32cfb
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
4 changed files with 2 additions and 9 deletions

View file

@ -69,8 +69,6 @@ services:
- data:/data - data:/data
nginx: nginx:
environment:
- NGINX_PROXY_PORT=443
restart: always restart: always
volumes: volumes:
- data:/data - data:/data

View file

@ -244,8 +244,7 @@ services:
image: aurweb:latest image: aurweb:latest
init: true init: true
environment: environment:
# Proxy toward FastAPI. - AUR_CONFIG=conf/config
- NGINX_PROXY_PORT=8444
entrypoint: /docker/nginx-entrypoint.sh entrypoint: /docker/nginx-entrypoint.sh
command: /docker/scripts/run-nginx.sh command: /docker/scripts/run-nginx.sh
ports: ports:

View file

@ -136,7 +136,7 @@ http {
location / { location / {
proxy_pass http://asgi_backend; proxy_pass http://asgi_backend;
proxy_set_header Host HTTP_HOST; proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Ssl on; proxy_set_header X-Forwarded-Ssl on;

View file

@ -21,8 +21,4 @@ fi
cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf
# NGINX_PROXY_PORT must be defined for the `nginx` service
# within `docker-compose.yml`.
sed -i "s|HTTP_HOST|\$host:${NGINX_PROXY_PORT}|g" /etc/nginx/nginx.conf
exec "$@" exec "$@"