diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a298a0..60e2633 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: - run: name: Heroku deploy command: | - git push https://heroku:$HEROKU_API_KEY@git.heroku.com/devoptpfinal.git main + git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_PROJECT_NAME.git main test: docker: diff --git a/Procfile b/Procfile index 60df632..48742c7 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3 +web: flask db upgrade; gunicorn autoapp:app -b 0.0.0.0:$PORT -w 3 diff --git a/conduit/settings.py b/conduit/settings.py index b838a6d..5bce3a9 100644 --- a/conduit/settings.py +++ b/conduit/settings.py @@ -25,6 +25,12 @@ class Config(object): 'http://localhost:4200', 'http://0.0.0.0:4000', 'http://localhost:4000', + 'https://devoptpfinal.herokuapp.com/api/articles', + 'https://devoptpfinal.herokuapp.com', + 'http://0.0.0.0:5432', + 'http://localhost:5432', + 'http://0.0.0.0:' + os.environ.get('PORT', '8080'), + 'https://0.0.0.0:' + os.environ.get('PORT', '8080'), ] JWT_HEADER_TYPE = 'Token' diff --git a/requirements/prod.txt b/requirements/prod.txt index 19a1d8e..f581e1f 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,7 +1,7 @@ # Everything needed in production Werkzeug -SQLAlchemy==1.1.9 +SQLAlchemy==1.3.0 Flask_Caching Flask_SQLAlchemy==2.2 click