trent_larson/py-push-server
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make docker path consistent, and enhance instructions

Browse Source
This commit is contained in:
Trent Larson
2023-12-02 15:00:31 -07:00
parent 72653abaf5
commit e8a33e876c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@@ -5,7 +5,7 @@
```
export PUSH_SERVER_VERSION=0.1
# also in build.sh
# This command is also in build.sh
docker build --tag py-push-server:amd-$PUSH_SERVER_VERSION --platform linux/amd64 .
docker save -o ~/dl/py-push-server-amd-$PUSH_SERVER_VERSION.tar py-push-server:amd-$PUSH_SERVER_VERSION
@@ -22,7 +22,7 @@ bzip2 -d py-push-server-amd-$PUSH_SERVER_VERSION.tar.bz2
sudo docker load -i py-push-server-amd-$PUSH_SERVER_VERSION.tar
sudo docker run -d -p 8900:3000 -v ~/py-push-server-db:/app/instance/data --name py-push-server-$PUSH_SERVER_VERSION py-push-server:amd-$PUSH_SERVER_VERSION
sudo docker run -d -p 8900:3000 -v ~/py-push-server-db:/srv/py-push-server/data --name py-push-server-$PUSH_SERVER_VERSION py-push-server:amd-$PUSH_SERVER_VERSION
```
@@ -227,9 +227,13 @@ Run the app:
```commandline
sh <(curl https://pkgx.sh) +python.org +virtualenv.pypa.io sh
pip install gunicorn
source venv/bin/activate
python app.py
gunicorn -b 0.0.0.0:3000 --log-level=debug --workers=3 app:app
# ... and see the results in a browser: http://localhost:3000/web-push/vapid
# See Troubleshooting below if that doesn't work out of the box.
```
@@ -256,6 +260,9 @@ Run haproxy (on a Mac):
Troubleshooting
* If you get "unable to open database file", you can edit the app.py line with
SQLALCHEMY_DATABASE_URI and add `sqlite:////...` with the full path to the data/webpush.db file.
* If you get "no such table: vapid_key" then your file pointers are probably wrong.
Check that the "docker run" mounted volume matches the SQLALCHEMY_DATABASE_URI in the app.py file.
* If you get "unable to open database file", you can provide the app.py with
SQLALCHEMY_DATABASE_URI with `sqlite:////...` with the full path to the data/webpush.db file.
(Why does the relative path of `sqlite:///...` not work for a relative path?)

2
app.py
View File

@@ -37,7 +37,7 @@ class WebPushService():
self.app = app
# Setting the database URI for the application
db_uri = os.getenv('SQLALCHEMY_DATABASE_URI', 'sqlite:////app/instance/data/webpush.db')
db_uri = os.getenv('SQLALCHEMY_DATABASE_URI', 'sqlite:////srv/py-push-server/data/webpush.db')
# This relative path works in docker-compose
#db_uri = os.getenv('SQLALCHEMY_DATABASE_URI', 'sqlite:///data/webpush.db')
self.app.config['SQLALCHEMY_DATABASE_URI'] = db_uri