opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-10-28 02:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused streaming port 8075 from cluster configuration (#37024)

Browse Source 
* Remove legacy streaming port 8075 from Dockerfile EXPOSE

* Remove legacy streaming port 8075 from Dockerfile.fips EXPOSE

* Remove legacy SteamingPort (streaming port) from cluster settings tests

* Remove legacy ports 8064 and 8075 from cluster docker-compose

* Restore original datasource escape sequence in docker-compose

* Revert MM_SQLSETTINGS_DATASOURCE to original & escape sequences

* Restore \\u0026 escape sequences in MM_SQLSETTINGS_DATASOURCE

* Restore \\u0026 escape in MM_SQLSETTINGS_DATASOURCE, keep port cleanup

* Restore \\u0026 escape in MM_SQLSETTINGS_DATASOURCE (match master)

* Restore literal backslash-u0026 in MM_SQLSETTINGS_DATASOURCE

* Restore \\u0026 escape sequences to match master

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Ben Schumacher
2026-06-17 19:02:58 +02:00
committed by GitHub
co-authored by Mattermost Build
parent ffb86ddcae
commit 99ea984ead
4 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/build/Dockerfile
+1 -1
View File
@@ -82,7 +82,7 @@ HEALTHCHECK --interval=30s --timeout=10s \
WORKDIR /mattermost
CMD ["/mattermost/bin/mattermost"]
EXPOSE 8065 8067 8074 8075
EXPOSE 8065 8067 8074
# Declare volumes for mount point directories
VOLUME ["/mattermost/data", "/mattermost/logs", "/mattermost/config", "/mattermost/plugins", "/mattermost/client/plugins"]
server/build/Dockerfile.fips
+1 -1
View File
@@ -85,7 +85,7 @@ HEALTHCHECK --interval=30s --timeout=10s \
WORKDIR /mattermost
CMD ["/mattermost/bin/mattermost"]
EXPOSE 8065 8067 8074 8075
EXPOSE 8065 8067 8074
# Declare volumes for mount point directories
VOLUME ["/mattermost/data", "/mattermost/logs", "/mattermost/config", "/mattermost/plugins", "/mattermost/client/plugins"]
server/docker-compose.yaml
+3 -12
View File
@@ -117,7 +117,7 @@ services:
working_dir: '/home/mattermost-server/server'
environment:
- "MM_SQLSETTINGS_DRIVERNAME=postgres"
- "MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mostest@postgres/mattermost_test?sslmode=disable\u0026connect_timeout=10"
- "MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mostest@postgres/mattermost_test?sslmode=disable&connect_timeout=10"
- "MM_NO_DOCKER=true"
- "RUN_SERVER_IN_BACKGROUND=false"
- "MM_CLUSTERSETTINGS_ENABLE=true"
@@ -141,11 +141,8 @@ services:
command: ['make', 'run-server']
expose:
- "8065"
- "8064/tcp"
- "8064/udp"
- "8074/tcp"
- "8074/udp"
- "8075"
follower:
build:
@@ -154,7 +151,7 @@ services:
working_dir: '/home/mattermost-server/server'
environment:
- "MM_SQLSETTINGS_DRIVERNAME=postgres"
- "MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mostest@postgres/mattermost_test?sslmode=disable\u0026connect_timeout=10"
- "MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mostest@postgres/mattermost_test?sslmode=disable&connect_timeout=10"
- "MM_NO_DOCKER=true"
- "RUN_SERVER_IN_BACKGROUND=false"
- "MM_CLUSTERSETTINGS_ENABLE=true"
@@ -178,11 +175,8 @@ services:
restart: on-failure
expose:
- "8065"
- "8064/tcp"
- "8064/udp"
- "8074/tcp"
- "8074/udp"
- "8075"
follower2:
build:
@@ -191,7 +185,7 @@ services:
working_dir: '/home/mattermost-server/server'
environment:
- "MM_SQLSETTINGS_DRIVERNAME=postgres"
- "MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mostest@postgres/mattermost_test?sslmode=disable\u0026connect_timeout=10"
- "MM_SQLSETTINGS_DATASOURCE=postgres://mmuser:mostest@postgres/mattermost_test?sslmode=disable&connect_timeout=10"
- "MM_NO_DOCKER=true"
- "RUN_SERVER_IN_BACKGROUND=false"
- "MM_CLUSTERSETTINGS_ENABLE=true"
@@ -215,11 +209,8 @@ services:
restart: on-failure
expose:
- "8065"
- "8064/tcp"
- "8064/udp"
- "8074/tcp"
- "8074/udp"
- "8075"
haproxy:
image: nginx