From ddd4426c5ddce286b7fc53a68263297e6ebaa3fc Mon Sep 17 00:00:00 2001
From: Kononnable <kononnable@gmail.com>
Date: Sun, 25 Feb 2018 17:06:09 +0100
Subject: [PATCH 1/4] moving CI mssql test to docker

---
 docker-compose.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0b3a074..ba3035c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,21 +29,21 @@ services:
       POSTGRES_PASSWORD: "!Passw0rd"
 
   # mssql
-  # mssql:
-  #   image: "microsoft/mssql-server-linux:2017-GA"
-  #   container_name: "typeorm-mg-mssql"
-  #   ports:
-  #     - "1433:1433"
-  #   environment:
-  #     ACCEPT_EULA: "Y"
-  #     SA_PASSWORD: "!Passw0rd"
+  mssql:
+    image: "microsoft/mssql-server-linux:2017-GA"
+    container_name: "typeorm-mg-mssql"
+    ports:
+      - "1433:1433"
+    environment:
+      ACCEPT_EULA: "Y"
+      SA_PASSWORD: "!Passw0rd"
 
   # oracle
-  # oracle:
-  #   image: "store/oracle/database-enterprise:12.2.0.1-slim"
-  #   container_name: "typeorm-mg-oracle"
-  #   ports:
-  #     - "1521:1521"
-  # environment:
-  #   DB_SID: "ORCLCDB"
-  #   SYS_PASSWORD: "Oradoc_db1"
+#   oracle:
+#     image: "store/oracle/database-enterprise:12.2.0.1-slim"
+#     container_name: "typeorm-mg-oracle"
+#     ports:
+#       - "1521:1521"
+#     environment:
+#         DB_SID: "ORCLCDB"
+#         SYS_PASSWORD: "Oradoc_db1"

From 4f96501e6feefb218279d0325e33a275a9c9fb84 Mon Sep 17 00:00:00 2001
From: Kononnable <kononnable@gmail.com>
Date: Sun, 25 Feb 2018 17:32:00 +0100
Subject: [PATCH 2/4] t1

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1b05f74..f9fa3cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,9 @@ env:
             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
+            MARIADB_Database=typeorm_mg MARIADB_SSL=0 MSSQL_Skip=0
+            MSSQL_Host=localhost MSSQL_Port=1433 MSSQL_Username=sa
+            MSSQL_Password=!Passw0rd MSSQL_Database=typeorm_mg MSSQL_SSL=0
     global:
         secure: >-
             Xj6wO8aghAhi6nvBI/HTtW9mIq9xfigIQfCC7ZkgAcqS4Oe3ba+7A5pCJq6Fxndadc6Bg1bZ3BGCH3Upf/Yv3zCFybsk43LwwXPJoG9gCrva/me7Sd+ws30EcD2dsKbvjZqNYai/XdrhzJY+KlxWvS/g3N/puBNffcU5hteo1zllxakQIAiavJ64D4g+Th8LSytmb2qDDToSsCxXkzNSutaKgZSf6T8QCWzcl0NCZkl69s9kX7L5335HVBD9lR/EKFC4wqHQjryCDRAyNRvItZRNlTPqgOI8lvcTsH9zKozDwEz7h/zcLebbY/+YTsLB5pb2sa62tkQE0x24TG7bLxujQShEQZU8itkRSV+w6+0JpBHQPlSUppkQJBNGKao7GaO/Eix4mSyvHkeECmTWDtEpBGWERYLqCKGe2Nj3BfcA2Ue6pjz9CX8wnrCbx53j6be3M/g/gcx7fbJbX3P95yc1CWAaR+tJKlP38rTcyo+o+Db1Ft0pzRJyZGmkGGPnCj6LxWYSmVqumLYDyqAMBDcQYuVwaKaTsJtU/2OBb3+zjKmWivV+19SXBqILvFbLv9IYLavpMr9OAwDGcJu0+mF+VCjGkZTlBxWJ53PmCoIJ6Qx/5o67LsCYL4L/hugNETlOEEKwe/k1mBraYWB0jI3mBUCV0d8J5P+ZQhwIZo4=

From 157e8be9d9345c660d5866fc32505408b7a60ef3 Mon Sep 17 00:00:00 2001
From: Kononnable <kononnable@gmail.com>
Date: Sun, 25 Feb 2018 17:44:34 +0100
Subject: [PATCH 3/4] removing travis secrets, docker login

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9fa3cb..f963af1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,13 +19,9 @@ env:
             MARIADB_Database=typeorm_mg MARIADB_SSL=0 MSSQL_Skip=0
             MSSQL_Host=localhost MSSQL_Port=1433 MSSQL_Username=sa
             MSSQL_Password=!Passw0rd MSSQL_Database=typeorm_mg MSSQL_SSL=0
-    global:
-        secure: >-
-            Xj6wO8aghAhi6nvBI/HTtW9mIq9xfigIQfCC7ZkgAcqS4Oe3ba+7A5pCJq6Fxndadc6Bg1bZ3BGCH3Upf/Yv3zCFybsk43LwwXPJoG9gCrva/me7Sd+ws30EcD2dsKbvjZqNYai/XdrhzJY+KlxWvS/g3N/puBNffcU5hteo1zllxakQIAiavJ64D4g+Th8LSytmb2qDDToSsCxXkzNSutaKgZSf6T8QCWzcl0NCZkl69s9kX7L5335HVBD9lR/EKFC4wqHQjryCDRAyNRvItZRNlTPqgOI8lvcTsH9zKozDwEz7h/zcLebbY/+YTsLB5pb2sa62tkQE0x24TG7bLxujQShEQZU8itkRSV+w6+0JpBHQPlSUppkQJBNGKao7GaO/Eix4mSyvHkeECmTWDtEpBGWERYLqCKGe2Nj3BfcA2Ue6pjz9CX8wnrCbx53j6be3M/g/gcx7fbJbX3P95yc1CWAaR+tJKlP38rTcyo+o+Db1Ft0pzRJyZGmkGGPnCj6LxWYSmVqumLYDyqAMBDcQYuVwaKaTsJtU/2OBb3+zjKmWivV+19SXBqILvFbLv9IYLavpMr9OAwDGcJu0+mF+VCjGkZTlBxWJ53PmCoIJ6Qx/5o67LsCYL4L/hugNETlOEEKwe/k1mBraYWB0jI3mBUCV0d8J5P+ZQhwIZo4=
 before_install:
     - sudo service mysql stop
     - sudo service postgresql stop
-    - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
     - docker-compose up -d
     - npm install -g npm@5
     - npm install -g greenkeeper-lockfile@1

From 57164e0767a7df4e1f22ea5a62ac980269212f80 Mon Sep 17 00:00:00 2001
From: Kononnable <kononnable@gmail.com>
Date: Sun, 25 Feb 2018 17:50:23 +0100
Subject: [PATCH 4/4] changing docker mssql image version to newer(less memory
 consumption)

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ba3035c..e5ec067 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
 
   # mssql
   mssql:
-    image: "microsoft/mssql-server-linux:2017-GA"
+    image: "microsoft/mssql-server-linux:2017-CU4"
     container_name: "typeorm-mg-mssql"
     ports:
       - "1433:1433"