Merge branch 'master' into patch-1

This commit is contained in:
Kononnable 2019-01-16 18:51:59 +01:00 committed by GitHub
commit 5ba10e2068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,42 +3,50 @@ services:
# mysql
mysql:
image: "mysql:5.7.19"
image: "mysql:5.7.10"
container_name: "typeorm-mg-mysql"
ports:
- "3306:3306"
environment:
MYSQL_ROOT_PASSWORD: "!Passw0rd"
MYSQL_ROOT_PASSWORD: "admin"
MYSQL_USER: "test"
MYSQL_PASSWORD: "test"
MYSQL_DATABASE: "test"
# mariadb
mariadb:
image: "mariadb:10.2.9"
image: "mariadb:10.1.16"
container_name: "typeorm-mg-mariadb"
ports:
- "3307:3306"
environment:
MYSQL_ROOT_PASSWORD: "!Passw0rd"
MYSQL_ROOT_PASSWORD: "admin"
MYSQL_USER: "test"
MYSQL_PASSWORD: "test"
MYSQL_DATABASE: "test"
# postgres
postgres:
image: "postgres:10.0"
image: "mdillon/postgis:9.6"
container_name: "typeorm-mg-postgres"
ports:
- "5432:5432"
environment:
POSTGRES_PASSWORD: "!Passw0rd"
POSTGRES_USER: "test"
POSTGRES_PASSWORD: "test"
POSTGRES_DB: "test"
# mssql
mssql:
image: "microsoft/mssql-server-linux:2017-CU4"
image: "mcr.microsoft.com/mssql/server:2017-GA-ubuntu"
container_name: "typeorm-mg-mssql"
ports:
- "1433:1433"
environment:
SA_PASSWORD: "Admin12345"
ACCEPT_EULA: "Y"
SA_PASSWORD: "!Passw0rd"
# oracle
# # oracle
# oracle:
# image: "store/oracle/database-enterprise:12.2.0.1-slim"
# container_name: "typeorm-mg-oracle"