From 2db4809f8d7b24cef1c99d021c4ff618f5a64b00 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Sat, 15 Jan 2022 19:01:53 -0800 Subject: [PATCH] Revert "fix(docker): rewrite trailing slashes with AURWEB_FASTAPI_PREFIX" This reverts commit 29b86dd15acbc94e89797e8309b0791d8e4d9c1d. --- docker-compose.aur-dev.yml | 2 -- docker-compose.yml | 2 +- docker/nginx-entrypoint.sh | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml index c06e9e56..0b91dd93 100644 --- a/docker-compose.aur-dev.yml +++ b/docker-compose.aur-dev.yml @@ -69,8 +69,6 @@ services: - data:/data nginx: - environment: - - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX} restart: always volumes: - data:/data diff --git a/docker-compose.yml b/docker-compose.yml index 7f58803f..ebc760d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -244,7 +244,7 @@ services: image: aurweb:latest init: true environment: - - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX} + - AUR_CONFIG=conf/config entrypoint: /docker/nginx-entrypoint.sh command: /docker/scripts/run-nginx.sh ports: diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh index c0c0c848..1527cda7 100755 --- a/docker/nginx-entrypoint.sh +++ b/docker/nginx-entrypoint.sh @@ -20,6 +20,5 @@ else fi cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf -sed -i "s|AURWEB_FASTAPI_PREFIX|${AURWEB_FASTAPI_PREFIX}|g" /etc/nginx/nginx.conf exec "$@"