From fa07f940514fd30886acf3d47c3a37d79940adfa Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Sat, 4 Sep 2021 19:08:10 -0700 Subject: [PATCH] Docker: Fix FastAPI db initialization PHP was doing this correctly, but FastAPI was doing this in it's exec script @ docker/scripts/run-fastapi.sh. Modify the fastapi service so that it does the same thing as PHP, and the existing "fastapi restart quirk" is no more. Signed-off-by: Kevin Morris --- docker/fastapi-entrypoint.sh | 3 +++ docker/scripts/run-fastapi.sh | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/fastapi-entrypoint.sh b/docker/fastapi-entrypoint.sh index 41a88206..83a2cda8 100755 --- a/docker/fastapi-entrypoint.sh +++ b/docker/fastapi-entrypoint.sh @@ -14,4 +14,7 @@ sed -ri 's|^(redis_address) = .+|\1 = redis://redis|' conf/config sed -ri "s|^(git_clone_uri_anon) = .+|\1 = https://localhost:8444/%s.git|" conf/config.defaults sed -ri "s|^(git_clone_uri_priv) = .+|\1 = ssh://aur@localhost:2222/%s.git|" conf/config.defaults +# Initialize the new database; ignore errors. +python -m aurweb.initdb 2>/dev/null || /bin/true + exec "$@" diff --git a/docker/scripts/run-fastapi.sh b/docker/scripts/run-fastapi.sh index 1db4c505..bb1a01a7 100755 --- a/docker/scripts/run-fastapi.sh +++ b/docker/scripts/run-fastapi.sh @@ -1,8 +1,5 @@ #!/bin/bash -# Initialize the new database; ignore errors. -python -m aurweb.initdb 2>/dev/null || /bin/true - if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then exec uvicorn --reload \ --ssl-certfile /cache/localhost.cert.pem \