upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-02-03 20:40:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Change inbucket default port from 10080 to 9001 (#18145)

Browse source
This commit is contained in:
Devin Binnie 2021-08-18 09:31:25 -04:00 committed by GitHub
parent 2547e47eab
commit 0dbaa48741
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/docker-compose-generator/main.go
View file

@ -28,7 +28,7 @@ func main() {
"mysql": 3306,
"postgres": 5432,
"minio": 9000,
"inbucket": 10080,
"inbucket": 9001,
"openldap": 389,
"elasticsearch": 9200,
"dejavu": 1358,

2
build/docker-compose.common.yml
View file

@ -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:

2
build/docker-compose.yml
View file

@ -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:

2
build/dotenv/test.env
View file

@ -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

2
build/gitlab-dc.common.yml
View file

@ -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:

2
build/gitlab-dc.mysql.yml
View file

@ -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:

2
build/gitlab-dc.postgres.yml
View file

@ -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:

2
docker-compose.makefile.yml
View file

@ -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

4
docker-compose.yaml
View file

@ -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:

2
shared/mail/inbucket.go
View file

@ -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)
}