From 58eda4c75cceaf323d96e7fcb2c2fdf0522b7275 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Thu, 13 Jan 2022 23:47:16 -0800 Subject: [PATCH 1/3] fix(docker): use gunicorn's --proxy-protocol Signed-off-by: Kevin Morris --- docker/scripts/run-fastapi.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh index d3d75359..9aa63229 100755 --- a/docker/scripts/run-fastapi.sh +++ b/docker/scripts/run-fastapi.sh @@ -22,6 +22,7 @@ if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then elif [ "$1" == "gunicorn" ]; then exec gunicorn \ --log-config /docker/logging.conf \ + --proxy-protocol \ --bind "0.0.0.0:8000" \ -w $FASTAPI_WORKERS \ -k uvicorn.workers.UvicornWorker \ From dff69a7ec1835bb00fafae7323a03c3d373bccf2 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Thu, 13 Jan 2022 23:48:17 -0800 Subject: [PATCH 2/3] configure staging deployment Signed-off-by: Kevin Morris --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e738dd1c..ba4a4dea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ deploy: tags: - secure rules: - - if: $CI_COMMIT_BRANCH == "pu" + - if: $CI_COMMIT_BRANCH == "pu-staging" when: manual variables: FASTAPI_BACKEND: gunicorn From 1fe7a62afe2885ea69866aec9f9ccb72657cb28e Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Thu, 13 Jan 2022 23:51:02 -0800 Subject: [PATCH 3/3] remove cache Signed-off-by: Kevin Morris --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba4a4dea..b06f30aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ deploy: - export DOCKER_HOST="unix:///tmp/docker.sock" # Set secure login config for aurweb. - sed -ri "s/^(disable_http_login).*$/\1 = 1/" conf/config.dev - - docker-compose build + - docker-compose build --no-cache - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml down --remove-orphans - docker-compose -f docker-compose.yml -f docker-compose.aur-dev.yml up -d - docker image prune -f