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 <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-09-04 19:08:10 -07:00
parent 3f034ac128
commit fa07f94051
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 3 additions and 3 deletions

View file

@ -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_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 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 "$@" exec "$@"

View file

@ -1,8 +1,5 @@
#!/bin/bash #!/bin/bash
# Initialize the new database; ignore errors.
python -m aurweb.initdb 2>/dev/null || /bin/true
if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then if [ "$1" == "uvicorn" ] || [ "$1" == "" ]; then
exec uvicorn --reload \ exec uvicorn --reload \
--ssl-certfile /cache/localhost.cert.pem \ --ssl-certfile /cache/localhost.cert.pem \