From d9e3c8b089330a7df1d9f94e8dbf0b4125748f86 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 13 Oct 2018 14:44:49 +0300 Subject: [PATCH 1/6] step1 --- .travis.yml | 12 +++++++++++- src/src/settings.py | 20 ++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 678bc5e..ce0db38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,21 @@ language: python python: - "3.5.2" +env: + - DOCKER_COMPOSE_VERSION=1.22.0 + services: - mysql before_install: - - mysql -e 'CREATE DATABASE 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 -e 'CREATE DATABASE travis_dev;' + +# - mysql -e 'CREATE DATABASE dev;' install: - pip install -r requirements-test.txt diff --git a/src/src/settings.py b/src/src/settings.py index bc15568..7571d6b 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': 3306 } } + DEBUG = False elif DEBUG or TESTING: try: From ed0ec71e91cdb71d5a934f14fb5f09999904d213 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 13 Oct 2018 14:50:40 +0300 Subject: [PATCH 2/6] fix1 --- docker-compose.yml | 2 +- src/src/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7571d6b..6344a75 100644 --- a/src/src/settings.py +++ b/src/src/settings.py @@ -163,7 +163,7 @@ 'USER': 'root', 'PASSWORD': 'root', 'HOST': '0.0.0.0', - 'PORT': 3306 + 'PORT': 53306 } } From 48d3e67af9cc374942f408338d07f483bdbd5fe6 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 13 Oct 2018 14:54:33 +0300 Subject: [PATCH 3/6] fix2 --- .travis.yml | 7 +------ docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce0db38..0d11d05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,13 @@ python: env: - DOCKER_COMPOSE_VERSION=1.22.0 -services: - - mysql - before_install: - 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 -e 'CREATE DATABASE travis_dev;' - -# - mysql -e 'CREATE DATABASE dev;' + - 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 dd29cd7..95efd50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: env_file: - ./common.env ports: - - 53306:3306 + - 3306:3306 # hostname: 127.0.0.1 # socket: /var/run/mysqld/mysqld.sock #just comment it out From fb2ec70675a4a3b34f80759d484249eca6778131 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 13 Oct 2018 14:56:50 +0300 Subject: [PATCH 4/6] fix3 --- docker-compose.yml | 2 +- src/src/settings_dev.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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_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 } } From 31d50d38168705088c6236632643ddd36a7ac9f0 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 13 Oct 2018 15:09:20 +0300 Subject: [PATCH 5/6] fix4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0d11d05..281e820 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: - DOCKER_COMPOSE_VERSION=1.22.0 before_install: + - sudo apt-get install python-dev default-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 From 8dd70cc79ac8348ce5959974aa849de359dfa525 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 13 Oct 2018 15:12:44 +0300 Subject: [PATCH 6/6] fix5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 281e820..ccca29c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ env: - DOCKER_COMPOSE_VERSION=1.22.0 before_install: - - sudo apt-get install python-dev default-libmysqlclient-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