Move environment variables to env-file (#15820)

build/dotenv/test-schema-validation.env

@@ -0,0 +1,10 @@
+CI_INBUCKET_HOST=inbucket
+CI_MINIO_HOST=minio
+CI_INBUCKET_PORT=10080
+CI_MINIO_PORT=9000
+CI_INBUCKET_SMTP_PORT=10025
+CI_LDAP_HOST=openldap
+IS_CI=true
+MM_EMAILSETTINGS_SMTPSERVER=inbucket
+MM_EMAILSETTINGS_SMTPPORT=10025
+MM_ELASTICSEARCHSETTINGS_CONNECTIONURL=http://elasticsearch:9200

build/dotenv/test.env

@@ -0,0 +1,15 @@
+TEST_DATABASE_MYSQL_DSN=mmuser:mostest@tcp(mysql:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s
+TEST_DATABASE_POSTGRESQL_DSN=postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10
+TEST_DATABASE_MYSQL_ROOT_PASSWD=mostest
+GOBIN=/mattermost/mattermost-server/bin
+
+CI_INBUCKET_HOST=inbucket
+CI_MINIO_HOST=minio
+CI_INBUCKET_PORT=10080
+CI_MINIO_PORT=9000
+CI_INBUCKET_SMTP_PORT=10025
+CI_LDAP_HOST=openldap
+IS_CI=true
+MM_EMAILSETTINGS_SMTPSERVER=inbucket
+MM_EMAILSETTINGS_SMTPPORT=10025
+MM_ELASTICSEARCHSETTINGS_CONNECTIONURL=http://elasticsearch:9200

build/local-test-env.sh

@@ -28,22 +28,11 @@ up()
         -v $GOPATH:/go \
         -w /go/src/github.com/mattermost/mattermost-server/ \
         --net ${COMPOSE_PROJECT_NAME}_mm-test \
+        --env-file=dotenv/test.env
         -e GOPATH="/go" \
-        -e TEST_DATABASE_MYSQL_DSN="mmuser:mostest@tcp(mysql:3306)/mattermost_test?charset=utf8mb4,utf8\u0026readTimeout=30s\u0026writeTimeout=30s" \
-        -e TEST_DATABASE_POSTGRESQL_DSN="postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10" \
-        -e TEST_DATABASE_MYSQL_ROOT_PASSWD="mostest" \
-        -e CI_INBUCKET_HOST="inbucket" \
-        -e CI_MINIO_HOST="minio" \
-        -e CI_INBUCKET_PORT="10080" \
-        -e CI_MINIO_PORT="9000" \
-        -e CI_INBUCKET_SMTP_PORT="10025" \
-        -e CI_LDAP_HOST="openldap" \
-        -e IS_CI=true \
-        -e MM_SQLSETTINGS_DATASOURCE="mmuser:mostest@tcp(mysql:3306)/mattermost_test?charset=utf8mb4,utf8" \
-        -e MM_EMAILSETTINGS_SMTPSERVER="inbucket" \
-        -e MM_EMAILSETTINGS_SMTPPORT="10025" \
-        -e MM_ELASTICSEARCHSETTINGS_CONNECTIONURL="http://elasticsearch:9200" \
-        mattermost/mattermost-build-server:20200731_golang-1.14.6 /bin/bash
+        -e MM_SQLSETTINGS_DATASOURCE="postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10" \
+        -e MM_SQLSETTINGS_DRIVERNAME=postgres
+        mattermost/mattermost-build-server:20200731_golang-1.14.6 bash
 }
 
 down()