Browse Source

🚧 version modify url

main
spokequenouille 6 years ago
parent
commit
c4f6ccfd8f
  1. 6
      .circleci/config.yml
  2. 4
      conduit/settings.py

6
.circleci/config.yml

@ -8,7 +8,6 @@ jobs:
- restore_cache: - restore_cache:
key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }} key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }}
- run: - run:
name: Install dependencies in a python venv
command: | command: |
python3 -m venv venv python3 -m venv venv
. venv/bin/activate . venv/bin/activate
@ -35,7 +34,6 @@ jobs:
- restore_cache: - restore_cache:
key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }} key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }}
- run: - run:
name: Waiting for postgresql
command : dockerize -wait tcp://localhost:5432 -timeout 1m command : dockerize -wait tcp://localhost:5432 -timeout 1m
- run: - run:
name: Launching tests name: Launching tests
@ -49,7 +47,6 @@ jobs:
steps: steps:
- checkout - checkout
- run: - run:
name: Deploy main to heroku
command: | command: |
git config --global push.default matching git config --global push.default matching
git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git main git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git main
@ -66,9 +63,6 @@ workflows:
build_test_deploy: build_test_deploy:
jobs: jobs:
- build - build
- test:
requires:
- build
- deploy-heroku: - deploy-heroku:
context: Heroku context: Heroku
requires: requires:

4
conduit/settings.py

@ -25,6 +25,10 @@ class Config(object):
'http://localhost:4200', 'http://localhost:4200',
'http://0.0.0.0:4000', 'http://0.0.0.0:4000',
'http://localhost: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' JWT_HEADER_TYPE = 'Token'

Loading…
Cancel
Save