diff --git a/.circleci/config.yml b/.circleci/config.yml index 88d9f9e..73ff124 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,6 @@ jobs: - restore_cache: key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }} - run: - name: Install dependencies in a python venv command: | python3 -m venv venv . venv/bin/activate @@ -35,7 +34,6 @@ jobs: - restore_cache: key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }} - run: - name: Waiting for postgresql command : dockerize -wait tcp://localhost:5432 -timeout 1m - run: name: Launching tests @@ -49,7 +47,6 @@ jobs: steps: - checkout - run: - name: Deploy main to heroku command: | git config --global push.default matching git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git main @@ -66,9 +63,6 @@ workflows: build_test_deploy: jobs: - build - - test: - requires: - - build - deploy-heroku: context: Heroku requires: diff --git a/conduit/settings.py b/conduit/settings.py index b838a6d..869e908 100644 --- a/conduit/settings.py +++ b/conduit/settings.py @@ -25,6 +25,10 @@ class Config(object): 'http://localhost:4200', 'http://0.0.0.0:4000', 'http://localhost:4000', + 'http://0.0.0.0:' + os.environ.get('PORT', '8080'), + 'https://0.0.0.0:' + os.environ.get('PORT', '8080'), + 'https://elastic-poitras-e0b9b8.netlify.app', + os.environ.get('FRONT_PROD_URL', ''), ] JWT_HEADER_TYPE = 'Token'