From 3c651d8d9d95b93b4a4fb63c10e3c94cedb42453 Mon Sep 17 00:00:00 2001 From: Kononnable Date: Sat, 18 Nov 2017 17:43:25 +0100 Subject: [PATCH] travis - moving to remote sql server database --- .travis.yml | 4 ++-- docker-compose.yml | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84de49a..76197ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ services: - docker env: - - MSSQL_Skip=0 MSSQL_Host=localhost MSSQL_Port=1433 MSSQL_Username=sa MSSQL_Password=!Passw0rd MSSQL_Database=typeorm_mg MSSQL_SSL=1 POSTGRES_Skip=0 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=postgres POSTGRES_Password=!Passw0rd POSTGRES_Database=typeorm_mg POSTGRES_SSL=0 MYSQL_Skip=0 MYSQL_Host=localhost MYSQL_Port=3306 MYSQL_Username=root MYSQL_Password=!Passw0rd MYSQL_Database=typeorm_mg MYSQL_SSL=1 MARIADB_Skip=0 MARIADB_Host=localhost MARIADB_Port=3307 MARIADB_Username=root MARIADB_Password=!Passw0rd MARIADB_Database=typeorm_mg MARIADB_SSL=0 + - POSTGRES_Skip=0 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=postgres POSTGRES_Password=!Passw0rd POSTGRES_Database=typeorm_mg POSTGRES_SSL=0 MYSQL_Skip=0 MYSQL_Host=localhost MYSQL_Port=3306 MYSQL_Username=root MYSQL_Password=!Passw0rd MYSQL_Database=typeorm_mg MYSQL_SSL=1 MARIADB_Skip=0 MARIADB_Host=localhost MARIADB_Port=3307 MARIADB_Username=root MARIADB_Password=!Passw0rd MARIADB_Database=typeorm_mg MARIADB_SSL=0 before_install: - sudo service mysql stop @@ -25,4 +25,4 @@ before_script: - npm run typings-install - npm link typescript - tsc - - sleep 60s + diff --git a/docker-compose.yml b/docker-compose.yml index 3b01f87..5892a39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,12 +28,13 @@ services: environment: POSTGRES_PASSWORD: "!Passw0rd" - # mssql - mssql: - image: "microsoft/mssql-server-linux:2017-GA" - container_name: "typeorm-mssql" - ports: - - "1433:1433" - environment: - ACCEPT_EULA: "Y" - SA_PASSWORD: "!Passw0rd" \ No newline at end of file + # # mssql + # mssql: + # image: "microsoft/mssql-server-linux:2017-GA" + # container_name: "typeorm-mssql" + # ports: + # - "1433:1433" + # environment: + # ACCEPT_EULA: "Y" + # SA_PASSWORD: "!Passw0rd" + \ No newline at end of file