yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: do not expose 11883 by default in docker as we do not listen on it

This commit is contained in:
Ivan Dyachkov 2024-01-02 09:03:43 +01:00
parent 2b61f5290d
commit 1649f67996
6 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.ubuntu20.04.runner
View File

@ -30,11 +30,10 @@ VOLUME ["/opt/emqx/log", "/opt/emqx/data"]
# - 8083 for WebSocket/HTTP # - 8083 for WebSocket/HTTP
# - 8084 for WSS/HTTPS # - 8084 for WSS/HTTPS
# - 8883 port for MQTT(SSL) # - 8883 port for MQTT(SSL)
# - 11883 port for internal MQTT/TCP
# - 18083 for dashboard and API # - 18083 for dashboard and API
# - 4370 default Erlang distrbution port # - 4370 default Erlang distrbution port
# - 5369 for backplain gen_rpc # - 5369 for backplain gen_rpc
EXPOSE 1883 8083 8084 8883 11883 18083 4370 5369 EXPOSE 1883 8083 8084 8883 18083 4370 5369
ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]

4
deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
View File

@ -111,10 +111,6 @@ spec:
containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__WSS__DEFAULT__BIND | default 8084 }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__WSS__DEFAULT__BIND | default 8084 }}
- name: dashboard - name: dashboard
containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTP__BIND | default 18083 }} containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTP__BIND | default 18083 }}
{{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND) }}
- name: internalmqtt
containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND }}
{{- end }}
{{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTPS__BIND) }} {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTPS__BIND) }}
- name: dashboardtls - name: dashboardtls
containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTPS__BIND }} containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTPS__BIND }}

17
deploy/charts/emqx-enterprise/templates/service.yaml
View File

@ -41,17 +41,6 @@ spec:
{{- else if eq .Values.service.type "ClusterIP" }} {{- else if eq .Values.service.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND) }}
- name: internalmqtt
port: {{ .Values.service.internalmqtt | default 11883 }}
protocol: TCP
targetPort: internalmqtt
{{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.internalmqtt)) }}
nodePort: {{ .Values.service.nodePorts.internalmqtt }}
{{- else if eq .Values.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{ end }}
- name: mqttssl - name: mqttssl
port: {{ .Values.service.mqttssl | default 8883 }} port: {{ .Values.service.mqttssl | default 8883 }}
protocol: TCP protocol: TCP
@ -124,12 +113,6 @@ spec:
port: {{ .Values.service.mqtt | default 1883 }} port: {{ .Values.service.mqtt | default 1883 }}
protocol: TCP protocol: TCP
targetPort: mqtt targetPort: mqtt
{{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND) }}
- name: internalmqtt
port: {{ .Values.service.internalmqtt | default 11883 }}
protocol: TCP
targetPort: internalmqtt
{{ end }}
- name: mqttssl - name: mqttssl
port: {{ .Values.service.mqttssl | default 8883 }} port: {{ .Values.service.mqttssl | default 8883 }}
protocol: TCP protocol: TCP

4
deploy/charts/emqx/templates/StatefulSet.yaml
View File

@ -111,10 +111,6 @@ spec:
containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__WSS__DEFAULT__BIND | default 8084 }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__WSS__DEFAULT__BIND | default 8084 }}
- name: dashboard - name: dashboard
containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENERS__HTTP__BIND | default 18083 }} containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENERS__HTTP__BIND | default 18083 }}
{{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND) }}
- name: internalmqtt
containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND }}
{{- end }}
{{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__LISTENERS__HTTPS__BIND) }} {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__LISTENERS__HTTPS__BIND) }}
- name: dashboardtls - name: dashboardtls
containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENERS__HTTPS__BIND }} containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENERS__HTTPS__BIND }}

17
deploy/charts/emqx/templates/service.yaml
View File

@ -41,17 +41,6 @@ spec:
{{- else if eq .Values.service.type "ClusterIP" }} {{- else if eq .Values.service.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND) }}
- name: internalmqtt
port: {{ .Values.service.internalmqtt | default 11883 }}
protocol: TCP
targetPort: internalmqtt
{{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.internalmqtt)) }}
nodePort: {{ .Values.service.nodePorts.internalmqtt }}
{{- else if eq .Values.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{ end }}
- name: mqttssl - name: mqttssl
port: {{ .Values.service.mqttssl | default 8883 }} port: {{ .Values.service.mqttssl | default 8883 }}
protocol: TCP protocol: TCP
@ -124,12 +113,6 @@ spec:
port: {{ .Values.service.mqtt | default 1883 }} port: {{ .Values.service.mqtt | default 1883 }}
protocol: TCP protocol: TCP
targetPort: mqtt targetPort: mqtt
{{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__INTERNAL__BIND) }}
- name: internalmqtt
port: {{ .Values.service.internalmqtt | default 11883 }}
protocol: TCP
targetPort: internalmqtt
{{ end }}
- name: mqttssl - name: mqttssl
port: {{ .Values.service.mqttssl | default 8883 }} port: {{ .Values.service.mqttssl | default 8883 }}
protocol: TCP protocol: TCP

3
deploy/docker/Dockerfile
View File

@ -64,11 +64,10 @@ VOLUME ["/opt/emqx/log", "/opt/emqx/data"]
# - 8083 for WebSocket/HTTP # - 8083 for WebSocket/HTTP
# - 8084 for WSS/HTTPS # - 8084 for WSS/HTTPS
# - 8883 port for MQTT(SSL) # - 8883 port for MQTT(SSL)
# - 11883 port for internal MQTT/TCP
# - 18083 for dashboard and API # - 18083 for dashboard and API
# - 4370 default Erlang distribution port # - 4370 default Erlang distribution port
# - 5369 for backplane gen_rpc # - 5369 for backplane gen_rpc
EXPOSE 1883 8083 8084 8883 11883 18083 4370 5369 EXPOSE 1883 8083 8084 8883 18083 4370 5369
ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]