diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index 2891fe34d..0bafd6780 100644 --- a/deploy/charts/emqx/Chart.yaml +++ b/deploy/charts/emqx/Chart.yaml @@ -13,8 +13,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: v4.1.1 +version: 4.3.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: v4.1.1 +appVersion: latest diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 30cae8b89..ee02e0ae9 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -35,9 +35,9 @@ LABEL org.label-schema.docker.dockerfile="Dockerfile" \ org.label-schema.name="emqx" \ org.label-schema.version=${PKG_VSN} \ org.label-schema.description="EMQ (Erlang MQTT Broker) is a distributed, massively scalable, highly extensible MQTT messaging broker written in Erlang/OTP." \ - org.label-schema.url="http://emqx.io" \ + org.label-schema.url="https://emqx.io" \ org.label-schema.vcs-type="Git" \ - org.label-schema.vcs-url="https://github.com/emqx/emqx-docker" \ + org.label-schema.vcs-url="https://github.com/emqx/emqx" \ maintainer="Raymond M Mouthaan , Huang Rui , EMQ X Team " ARG QEMU_ARCH=x86_64 @@ -59,7 +59,7 @@ RUN chgrp -Rf emqx /opt/emqx && chmod -Rf g+w /opt/emqx \ USER emqx -VOLUME ["/opt/emqx/log", "/opt/emqx/data", "/opt/emqx/lib", "/opt/emqx/etc"] +VOLUME ["/opt/emqx/log", "/opt/emqx/data", "/opt/emqx/etc"] # emqx will occupy these port: # - 1883 port for MQTT @@ -72,8 +72,8 @@ VOLUME ["/opt/emqx/log", "/opt/emqx/data", "/opt/emqx/lib", "/opt/emqx/etc"] # - 4369 epmd (Erlang-distrbution port mapper daemon) listener (deprecated) # - 4370 default Erlang distrbution port # - 5369 for gen_rpc port mapping -# - 6369 for distributed node -EXPOSE 1883 8081 8083 8084 8883 11883 18083 4369 4370 5369 6369 +# - 6369 6370 for distributed node +EXPOSE 1883 8081 8083 8084 8883 11883 18083 4369 4370 5369 6369 6370 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 1fb2c4d45..87f17e41c 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -2,7 +2,7 @@ + **Where to get help**: - https://emqx.io, https://github.com/emqx/emqx-rel, or https://github.com/emqx/emqx + https://emqx.io or https://github.com/emqx/emqx + **Where to file issues:** @@ -72,16 +72,6 @@ These environment variables will ignore for configuration file. | EMQX_NAME | container name | none | emqx node short name | | EMQX_HOST | container IP | none | emqx node host, IP or FQDN | | EMQX_WAIT_TIME | 5 | none | wait time in sec before timeout | -| EMQX_NODE__NAME | EMQX_NAME@EMQX_HOST| node.name | Erlang node name, name@ipaddress/host | -| EMQX_NODE__COOKIE | emqx_dist_cookie | node.cookie | cookie for cluster | -| EMQX_LOG__CONSOLE | console | log.console | log console output method | -| EMQX_ALLOW_ANONYMOUS | true | allow_anonymous | allow mqtt anonymous login | -| EMQX_LISTENER__TCP__EXTERNAL| 1883 | listener.tcp.external | MQTT TCP port | -| EMQX_LISTENER__SSL__EXTERNAL| 8883 | listener.ssl.external | MQTT TCP TLS/SSL port | -| EMQX_LISTENER__WS__EXTERNAL | 8083 | listener.ws.external | HTTP and WebSocket port | -| EMQX_LISTENER__WSS__EXTERNAL| 8084 | listener.wss.external | HTTPS and WSS port | -| EMQX_LISTENER__API__MGMT | 8080 | listener.api.mgmt | MGMT API port | -| EMQX_MQTT__MAX_PACKET_SIZE | 64KB | mqtt.max_packet_size | Max Packet Size Allowed | The list is incomplete and may changed with [etc/emqx.conf](https://github.com/emqx/emqx/blob/master/etc/emqx.conf) and plugin configuration files. But the mapping rule is similar. @@ -129,6 +119,7 @@ Default environment variable ``EMQX_LOADED_PLUGINS``, including + ``emqx_recon`` + ``emqx_retainer`` ++ ``emqx_rule_engine`` + ``emqx_management`` + ``emqx_dashboard`` @@ -222,7 +213,7 @@ Let's create a static node list cluster from docker-compose. services: emqx1: - image: emqx/emqx:v4.0.0 + image: emqx/emqx:latest environment: - "EMQX_NAME=emqx" - "EMQX_HOST=node1.emqx.io" @@ -234,7 +225,7 @@ Let's create a static node list cluster from docker-compose. - node1.emqx.io emqx2: - image: emqx/emqx:v4.0.0 + image: emqx/emqx:latest environment: - "EMQX_NAME=emqx" - "EMQX_HOST=node2.emqx.io" @@ -301,7 +292,7 @@ services: ### Kernel Tuning -Under linux host machine, the easiest way is [tuning host machine's kernel](https://docs.emqx.io/broker/latest/en/tutorial/turn.html#turning-guide). +Under linux host machine, the easiest way is [Tuning guide](https://docs.emqx.io/en/broker/latest/tutorial/tune.html#linux-kernel-tuning). If you want tune linux kernel by docker, you must ensure your docker is latest version (>=1.12).