mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

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`
Этот коммит содержится в:
scott lee davis
2019-08-02 10:53:00 -04:00
коммит произвёл Jesse Hallam
родитель e4582905ea
Коммит 2fa63b10ec
16 изменённых файлов: 112 добавлений и 205 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
api4/apitestlib.go
Просмотреть файл

@@ -524,10 +524,10 @@ func (me *TestHelper) AddUserToChannel(user *model.User, channel *model.Channel)
}
func (me *TestHelper) GenerateTestEmail() string {
if *me.App.Config().EmailSettings.SMTPServer != "dockerhost" && os.Getenv("CI_INBUCKET_PORT") == "" {
if *me.App.Config().EmailSettings.SMTPServer != "localhost" && os.Getenv("CI_INBUCKET_PORT") == "" {
return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com")
}
return strings.ToLower(model.NewId() + "@dockerhost")
return strings.ToLower(model.NewId() + "@localhost")
}
func (me *TestHelper) CreateGroup() *model.Group {

4
api4/system_test.go
Просмотреть файл

@@ -127,7 +127,7 @@ func TestEmailTest(t *testing.T) {
inbucket_host := os.Getenv("CI_INBUCKET_HOST")
if inbucket_host == "" {
inbucket_host = "dockerhost"
inbucket_host = "localhost"
}
inbucket_port := os.Getenv("CI_INBUCKET_PORT")
@@ -362,7 +362,7 @@ func TestS3TestConnection(t *testing.T) {
s3Host := os.Getenv("CI_MINIO_HOST")
if s3Host == "" {
s3Host = "dockerhost"
s3Host = "localhost"
}
s3Port := os.Getenv("CI_MINIO_PORT")

24
api4/team_test.go
Просмотреть файл

@@ -109,7 +109,7 @@ func TestCreateTeamSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
}
rteam, resp := th.Client.CreateTeam(team)
@@ -125,7 +125,7 @@ func TestCreateTeamSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
}
rteam, resp := th.SystemAdminClient.CreateTeam(team)
@@ -192,7 +192,7 @@ func TestGetTeamSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)
@@ -375,7 +375,7 @@ func TestUpdateTeamSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)
@@ -480,7 +480,7 @@ func TestPatchTeamSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)
@@ -736,7 +736,7 @@ func TestGetAllTeamsSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
AllowOpenInvite: true,
})
CheckNoError(t, resp)
@@ -745,7 +745,7 @@ func TestGetAllTeamsSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
AllowOpenInvite: true,
})
CheckNoError(t, resp)
@@ -848,7 +848,7 @@ func TestGetTeamByNameSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)
@@ -973,7 +973,7 @@ func TestSearchAllTeamsSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)
team2, resp := th.Client.CreateTeam(&model.Team{
@@ -981,7 +981,7 @@ func TestSearchAllTeamsSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)
@@ -1091,7 +1091,7 @@ func TestGetTeamsForUserSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)
team2, resp := th.Client.CreateTeam(&model.Team{
@@ -1099,7 +1099,7 @@ func TestGetTeamsForUserSanitization(t *testing.T) {
Name: GenerateTestTeamName(),
Email: th.GenerateTestEmail(),
Type: model.TEAM_OPEN,
AllowedDomains: "simulator.amazonses.com,dockerhost",
AllowedDomains: "simulator.amazonses.com,localhost",
})
CheckNoError(t, resp)