From 0dbaa48741140f7ce8d2f5503d1b762a9d4d8e59 Mon Sep 17 00:00:00 2001 From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com> Date: Wed, 18 Aug 2021 09:31:25 -0400 Subject: [PATCH] Change inbucket default port from 10080 to 9001 (#18145) --- build/docker-compose-generator/main.go | 2 +- build/docker-compose.common.yml | 2 +- build/docker-compose.yml | 2 +- build/dotenv/test.env | 2 +- build/gitlab-dc.common.yml | 2 +- build/gitlab-dc.mysql.yml | 2 +- build/gitlab-dc.postgres.yml | 2 +- docker-compose.makefile.yml | 2 +- docker-compose.yaml | 4 ++-- shared/mail/inbucket.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/docker-compose-generator/main.go b/build/docker-compose-generator/main.go index d1abd94086..1d5f938135 100644 --- a/build/docker-compose-generator/main.go +++ b/build/docker-compose-generator/main.go @@ -28,7 +28,7 @@ func main() { "mysql": 3306, "postgres": 5432, "minio": 9000, - "inbucket": 10080, + "inbucket": 9001, "openldap": 389, "elasticsearch": 9200, "dejavu": 1358, diff --git a/build/docker-compose.common.yml b/build/docker-compose.common.yml index 3848b06424..6b7e860a3a 100644 --- a/build/docker-compose.common.yml +++ b/build/docker-compose.common.yml @@ -68,7 +68,7 @@ services: image: "inbucket/inbucket:stable" restart: always environment: - INBUCKET_WEB_ADDR: "0.0.0.0:10080" + INBUCKET_WEB_ADDR: "0.0.0.0:9001" INBUCKET_POP3_ADDR: "0.0.0.0:10110" INBUCKET_SMTP_ADDR: "0.0.0.0:10025" networks: diff --git a/build/docker-compose.yml b/build/docker-compose.yml index 2065b03aa2..f15c1f6ac5 100644 --- a/build/docker-compose.yml +++ b/build/docker-compose.yml @@ -58,7 +58,7 @@ services: - elasticsearch - prometheus - grafana - command: postgres:5432 mysql:3306 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 + command: postgres:5432 mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 networks: mm-test: diff --git a/build/dotenv/test.env b/build/dotenv/test.env index 244c797d95..62d622f3bb 100644 --- a/build/dotenv/test.env +++ b/build/dotenv/test.env @@ -5,7 +5,7 @@ GOBIN=/mattermost/mattermost-server/bin CI_INBUCKET_HOST=inbucket CI_MINIO_HOST=minio -CI_INBUCKET_PORT=10080 +CI_INBUCKET_PORT=9001 CI_MINIO_PORT=9000 CI_INBUCKET_SMTP_PORT=10025 CI_LDAP_HOST=openldap diff --git a/build/gitlab-dc.common.yml b/build/gitlab-dc.common.yml index fe4ffc1560..c18769c878 100644 --- a/build/gitlab-dc.common.yml +++ b/build/gitlab-dc.common.yml @@ -11,7 +11,7 @@ services: image: ${CI_REGISTRY}/mattermost/ci/images/inbucket:v3.0.0-rc1-2-gc64e7a6-1 restart: always environment: - INBUCKET_WEB_ADDR: "0.0.0.0:10080" + INBUCKET_WEB_ADDR: "0.0.0.0:9001" INBUCKET_POP3_ADDR: "0.0.0.0:10110" INBUCKET_SMTP_ADDR: "0.0.0.0:10025" openldap: diff --git a/build/gitlab-dc.mysql.yml b/build/gitlab-dc.mysql.yml index d9146b9bbb..9b83924535 100644 --- a/build/gitlab-dc.mysql.yml +++ b/build/gitlab-dc.mysql.yml @@ -92,7 +92,7 @@ services: - elasticsearch - prometheus - grafana - command: mysql:3306 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 + command: mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 networks: default: diff --git a/build/gitlab-dc.postgres.yml b/build/gitlab-dc.postgres.yml index 48b2ff124e..80d884bcf0 100644 --- a/build/gitlab-dc.postgres.yml +++ b/build/gitlab-dc.postgres.yml @@ -90,7 +90,7 @@ services: - elasticsearch - prometheus - grafana - command: postgres:5432 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 + command: postgres:5432 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 networks: default: diff --git a/docker-compose.makefile.yml b/docker-compose.makefile.yml index 8e5310efd0..eb10dc138e 100644 --- a/docker-compose.makefile.yml +++ b/docker-compose.makefile.yml @@ -36,8 +36,8 @@ services: restart: 'no' container_name: mattermost-inbucket ports: + - "9001:9001" - "10025:10025" - - "10080:10080" - "10110:10110" extends: file: build/docker-compose.common.yml diff --git a/docker-compose.yaml b/docker-compose.yaml index 5ad158d3d7..61fb04b5a5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -31,8 +31,8 @@ services: inbucket: container_name: mattermost-inbucket ports: + - "9001:9001" - "10025:10025" - - "10080:10080" - "10110:10110" extends: file: build/docker-compose.common.yml @@ -95,7 +95,7 @@ services: - elasticsearch - prometheus - grafana - command: postgres:5432 mysql:3306 minio:9000 inbucket:10080 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 + command: postgres:5432 mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 leader: build: diff --git a/shared/mail/inbucket.go b/shared/mail/inbucket.go index b23f6182f3..b105a8899e 100644 --- a/shared/mail/inbucket.go +++ b/shared/mail/inbucket.go @@ -183,7 +183,7 @@ func getInbucketHost() (host string) { inbucket_port := os.Getenv("CI_INBUCKET_PORT") if inbucket_port == "" { - inbucket_port = "10080" + inbucket_port = "9001" } return fmt.Sprintf("http://%s:%s", inbucket_host, inbucket_port) }