diff --git a/.travis.yml b/.travis.yml index 678bc5e..ccca29c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,17 @@ language: python python: - "3.5.2" -services: - - mysql +env: + - DOCKER_COMPOSE_VERSION=1.22.0 before_install: - - mysql -e 'CREATE DATABASE dev;' + - sudo apt-get install python-dev libmysqlclient-dev + - sudo rm /usr/local/bin/docker-compose + - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + - docker-compose up -d + - docker exec krovlyastroy_db_1 mysql -proot -e 'CREATE DATABASE travis_dev;' install: - pip install -r requirements-test.txt diff --git a/docker-compose.yml b/docker-compose.yml index 95efd50..dd29cd7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: env_file: - ./common.env ports: - - 3306:3306 + - 53306:3306 # hostname: 127.0.0.1 # socket: /var/run/mysqld/mysqld.sock #just comment it out diff --git a/src/src/settings.py b/src/src/settings.py index bc15568..6344a75 100644 --- a/src/src/settings.py +++ b/src/src/settings.py @@ -145,16 +145,28 @@ if 'TRAVIS' in os.environ: # TODO replace print('TRAVIS') + # DATABASES = { + # 'default': { + # 'ENGINE': 'django.db.backends.mysql', + # 'NAME': "dev", + # 'USER': 'root', + # 'PASSWORD': '', + # 'HOST': 'localhost', + # 'PORT': '' + # } + # } + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': "dev", + 'NAME': "travis_dev", 'USER': 'root', - 'PASSWORD': '', - 'HOST': 'localhost', - 'PORT': '' + 'PASSWORD': 'root', + 'HOST': '0.0.0.0', + 'PORT': 53306 } } + DEBUG = False elif DEBUG or TESTING: try: diff --git a/src/src/settings_dev.py b/src/src/settings_dev.py index 087ce97..29b1be2 100644 --- a/src/src/settings_dev.py +++ b/src/src/settings_dev.py @@ -5,7 +5,7 @@ 'USER': 'root', 'PASSWORD': 'root', 'HOST': '0.0.0.0', - 'PORT': 3306 + 'PORT': 53306 } }