f.spilla/typeorm-model-generator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/CIMssqlTestsOnDocker' into develop

Browse Source
This commit is contained in:
Kononnable 2018-02-25 19:05:10 +01:00
commit 3eeb7be881
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -16,14 +16,12 @@ 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
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=
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
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

32
docker-compose.yml
View File

@ -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-CU4"
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"