MM 7971 dockerhost -> localhost && docker -> docker-compose (#10872)
* replace dockerhost with localhost * remove uneeded setup-max build step (no more dockerhost) * changes as recommended by @cpanato * make clean-docker with docker-compose * added ports to docker-compose.yml (needed for osx). ignore error for ldapadd (when already exists) * add clean-old-docker to legacy.mk * docker-compose stop instead of down for `make stop-docker`
Этот коммит содержится в:
коммит произвёл
Jesse Hallam
родитель
e4582905ea
Коммит
2fa63b10ec
@@ -104,7 +104,7 @@ const (
|
||||
TEAM_SETTINGS_DEFAULT_CUSTOM_DESCRIPTION_TEXT = ""
|
||||
TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT = 300
|
||||
|
||||
SQL_SETTINGS_DEFAULT_DATA_SOURCE = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
|
||||
SQL_SETTINGS_DEFAULT_DATA_SOURCE = "mmuser:mostest@tcp(localhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
|
||||
|
||||
FILE_SETTINGS_DEFAULT_DIRECTORY = "./data/"
|
||||
|
||||
@@ -151,7 +151,7 @@ const (
|
||||
|
||||
TEAM_SETTINGS_DEFAULT_TEAM_TEXT = "default"
|
||||
|
||||
ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL = "http://dockerhost:9200"
|
||||
ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL = "http://localhost:9200"
|
||||
ELASTICSEARCH_SETTINGS_DEFAULT_USERNAME = "elastic"
|
||||
ELASTICSEARCH_SETTINGS_DEFAULT_PASSWORD = "changeme"
|
||||
ELASTICSEARCH_SETTINGS_DEFAULT_POST_INDEX_REPLICAS = 1
|
||||
@@ -1218,7 +1218,7 @@ func (s *EmailSettings) SetDefaults(isUpdate bool) {
|
||||
}
|
||||
|
||||
if s.SMTPServer == nil || len(*s.SMTPServer) == 0 {
|
||||
s.SMTPServer = NewString("dockerhost")
|
||||
s.SMTPServer = NewString("localhost")
|
||||
}
|
||||
|
||||
if s.SMTPPort == nil || len(*s.SMTPPort) == 0 {
|
||||
|
||||
Ссылка в новой задаче
Block a user