Docker Library Bot 1 год назад
Родитель
Сommit
edfbb8c70f
6 измененных файлов с 30 добавлено и 55 удалено
  1. 2 2
      dart/README.md
  2. 1 1
      elasticsearch/README.md
  3. 17 42
      emqx/README.md
  4. 1 1
      kibana/README.md
  5. 1 1
      logstash/README.md
  6. 8 8
      rust/README.md

+ 2 - 2
dart/README.md

@@ -24,8 +24,8 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`3.4.3-sdk`, `3.4-sdk`, `3-sdk`, `stable-sdk`, `sdk`, `3.4.3`, `3.4`, `3`, `stable`, `latest`](https://github.com/dart-lang/dart-docker/blob/6ac1650f30c0253aee1be07ceab3d8860efe7d2a/stable/bookworm/Dockerfile)
--	[`3.5.0-180.3.beta-sdk`, `beta-sdk`, `3.5.0-180.3.beta`, `beta`](https://github.com/dart-lang/dart-docker/blob/6ac1650f30c0253aee1be07ceab3d8860efe7d2a/beta/bookworm/Dockerfile)
+-	[`3.4.4-sdk`, `3.4-sdk`, `3-sdk`, `stable-sdk`, `sdk`, `3.4.4`, `3.4`, `3`, `stable`, `latest`](https://github.com/dart-lang/dart-docker/blob/d3658d21b1bd35658346d3fb4345d9a8084759e5/stable/bookworm/Dockerfile)
+-	[`3.5.0-180.3.beta-sdk`, `beta-sdk`, `3.5.0-180.3.beta`, `beta`](https://github.com/dart-lang/dart-docker/blob/d3658d21b1bd35658346d3fb4345d9a8084759e5/beta/bookworm/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 1 - 1
elasticsearch/README.md

@@ -25,7 +25,7 @@ WARNING:
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
 -	[`8.14.1`](https://github.com/elastic/dockerfiles/blob/69af7042cfc0b32c0d9de82110f15ff8dd74ded8/elasticsearch/Dockerfile)
 -	[`8.14.1`](https://github.com/elastic/dockerfiles/blob/69af7042cfc0b32c0d9de82110f15ff8dd74ded8/elasticsearch/Dockerfile)
--	[`7.17.21`](https://github.com/elastic/dockerfiles/blob/948af89c718b515fa24fa06f6a6890ed32e3b120/elasticsearch/Dockerfile)
+-	[`7.17.22`](https://github.com/elastic/dockerfiles/blob/1f54f19c85034114800de30ef9929c9b52947ffb/elasticsearch/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 17 - 42
emqx/README.md

@@ -85,51 +85,35 @@ The EMQX broker runs as Linux user `emqx` in the docker container.
 
 
 All EMQX Configuration in [`etc/emqx.conf`](https://github.com/emqx/emqx/blob/master/apps/emqx/etc/emqx.conf) can be configured via environment variables.
 All EMQX Configuration in [`etc/emqx.conf`](https://github.com/emqx/emqx/blob/master/apps/emqx/etc/emqx.conf) can be configured via environment variables.
 
 
-By default, the environment variables with `EMQX_` prefix are mapped to key-value pairs in configuration files.
-
-You can change the prefix by overriding `HOCON_ENV_OVERRIDE_PREFIX`.
-
 Example:
 Example:
 
 
-```bash
-EMQX_LISTENERS__SSL__DEFAULT__ACCEPTORS <--> listeners.ssl.default.acceptors
-EMQX_ZONES__DEFAULT__MQTT__MAX_PACKET_SIZE <--> zones.default.mqtt.max_packet_size
-```
+	EMQX_DASHBOARD__DEFAULT_PASSWORD       <--> dashboard.default_password
+	EMQX_NODE__COOKIE                      <--> node.cookie
+	EMQX_LISTENERS__SSL__default__ENABLE   <--> listeners.ssl.default.enable
+
+Note: The lowercase use of 'default' is not a typo. It is used to demonstrate that lowercase environment variables are equivalent.
 
 
 -	Prefix `EMQX_` is removed
 -	Prefix `EMQX_` is removed
--	All upper case letters is replaced with lower case letters
+-	All upper case letters are replaced with lower case letters
 -	`__` is replaced with `.`
 -	`__` is replaced with `.`
 
 
-If `HOCON_ENV_OVERRIDE_PREFIX=DEV_` is set:
-
-```bash
-DEV_LISTENER__SSL__EXTERNAL__ACCEPTORS <--> listener.ssl.external.acceptors
-DEV_MQTT__MAX_PACKET_SIZE              <--> mqtt.max_packet_size
-DEV_LISTENERS__TCP__DEFAULT__BIND      <--> listeners.tcp.default.bind
-```
-
 For example, set MQTT TCP port to 1883
 For example, set MQTT TCP port to 1883
 
 
 ```console
 ```console
-$ docker run -d --name emqx -e DEV_LISTENERS__TCP__DEFAULT__BIND=1883 -p 18083:18083 -p 1883:1883 emqx:latest
+$ docker run -d --name emqx -e EMQX_DASHBOARD__DEFAULT_PASSWORD=mysecret -p 18083:18083 -p 1883:1883 emqx:latest
 ```
 ```
 
 
-Please read more about EMQX configuration in the [official documentation](https://www.emqx.io/docs/en/v5.0/admin/cfg.html).
+Please read more about EMQX configuration in the [official documentation](https://docs.emqx.com/en/emqx/latest/configuration/configuration.html)
 
 
 #### EMQX node name configuration
 #### EMQX node name configuration
 
 
-| Options     | Default        | Mapped | Description                |
-|-------------|----------------|--------|----------------------------|
-| `EMQX_NAME` | container name | none   | EMQX node short name       |
-| `EMQX_HOST` | container IP   | none   | EMQX node host, IP or FQDN |
+Environment variable `EMQX_NODE__NAME` allows you to specify an EMQX node name, which defaults to `<container_name>@<container_ip>`.
 
 
-These environment variables are used during container startup phase only in [docker-entrypoint.sh](./docker-entrypoint.sh).
-
-If `EMQX_NAME` and `EMQX_HOST` are set, and `EMQX_NODE_NAME` is not set, `EMQX_NODE_NAME=$EMQX_NAME@$EMQX_HOST`. Otherwise `EMQX_NODE_NAME` is taken verbatim.
+If not specified, EMQX determines its node name based on the running environment or other environment variables used for node discovery.
 
 
 ### Cluster
 ### Cluster
 
 
-EMQX supports a variety of clustering methods, see our [documentation](https://www.emqx.io/docs/en/latest/deploy/cluster/intro.html) for details.
+EMQX supports a variety of clustering methods, see our [documentation](https://docs.emqx.com/en/emqx/latest/deploy/cluster/create-cluster.html) for details.
 
 
 Let's create a static node list cluster from docker-compose.
 Let's create a static node list cluster from docker-compose.
 
 
@@ -142,8 +126,7 @@ Let's create a static node list cluster from docker-compose.
     emqx1:
     emqx1:
       image: emqx:latest
       image: emqx:latest
       environment:
       environment:
-      - "EMQX_NAME=emqx"
-      - "EMQX_HOST=node1.emqx.io"
+      - "[email protected]"
       - "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
       - "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
       - "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
       - "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
       networks:
       networks:
@@ -154,8 +137,7 @@ Let's create a static node list cluster from docker-compose.
     emqx2:
     emqx2:
       image: emqx:latest
       image: emqx:latest
       environment:
       environment:
-      - "EMQX_NAME=emqx"
-      - "EMQX_HOST=node2.emqx.io"
+      - "[email protected]"
       - "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
       - "EMQX_CLUSTER__DISCOVERY_STRATEGY=static"
       - "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
       - "EMQX_CLUSTER__STATIC__SEEDS=[[email protected], [email protected]]"
       networks:
       networks:
@@ -177,7 +159,7 @@ Let's create a static node list cluster from docker-compose.
 -	View cluster
 -	View cluster
 
 
 ```bash
 ```bash
-  $ docker exec -it my_emqx_emqx1_1 sh -c "emqx_ctl cluster status"
+  $ docker exec -it my_emqx_emqx1_1 sh -c "emqx ctl cluster status"
   Cluster status: #{running_nodes => ['[email protected]','[email protected]'],
   Cluster status: #{running_nodes => ['[email protected]','[email protected]'],
                     stopped_nodes => []}
                     stopped_nodes => []}
 ```
 ```
@@ -187,10 +169,9 @@ Let's create a static node list cluster from docker-compose.
 If you want to persist the EMQX docker container, you need to keep the following directories:
 If you want to persist the EMQX docker container, you need to keep the following directories:
 
 
 -	`/opt/emqx/data`
 -	`/opt/emqx/data`
--	`/opt/emqx/etc`
 -	`/opt/emqx/log`
 -	`/opt/emqx/log`
 
 
-Since data in these folders are partially stored under the `/opt/emqx/data/mnesia/${node_name}`, the user also needs to reuse the same node name to see the previous state. In detail, one needs to specify the two environment variables: `EMQX_NAME` and `EMQX_HOST`, `EMQX_HOST` set as `127.0.0.1` or network alias would be useful.
+Since data in these folders are partially stored under the `/opt/emqx/data/mnesia/${node_name}`, the user also needs to reuse the same node name to see the previous state. To make this work, one needs to set the host part of `EMQX_NODE__NAME` to something static that does not change when you restart or recreate the container. It could be container name, hostname or loopback IP address `127.0.0.1` if you only have one node.
 
 
 In if you use docker-compose, the configuration would look something like this:
 In if you use docker-compose, the configuration would look something like this:
 
 
@@ -198,8 +179,6 @@ In if you use docker-compose, the configuration would look something like this:
 volumes:
 volumes:
   vol-emqx-data:
   vol-emqx-data:
     name: foo-emqx-data
     name: foo-emqx-data
-  vol-emqx-etc:
-    name: foo-emqx-etc
   vol-emqx-log:
   vol-emqx-log:
     name: foo-emqx-log
     name: foo-emqx-log
 
 
@@ -208,19 +187,15 @@ services:
     image: emqx:latest
     image: emqx:latest
     restart: always
     restart: always
     environment:
     environment:
-      EMQX_NAME: foo_emqx
-      EMQX_HOST: 127.0.0.1
+      EMQX_NODE__NAME: [email protected]
     volumes:
     volumes:
       - vol-emqx-data:/opt/emqx/data
       - vol-emqx-data:/opt/emqx/data
-      - vol-emqx-etc:/opt/emqx/etc
       - vol-emqx-log:/opt/emqx/log
       - vol-emqx-log:/opt/emqx/log
 ```
 ```
 
 
-Note that `/opt/emqx/etc` contains some essential configuration files. If you want to mount a host directory in the container to persist configuration overrides, you will need to bootstrap it with [default configuration files](https://github.com/emqx/emqx/tree/master/apps/emqx/etc).
-
 ### Kernel Tuning
 ### Kernel Tuning
 
 
-Under Linux host machine, the easiest way is [Tuning guide](https://www.emqx.io/docs/en/latest/deploy/tune.html).
+Under Linux host machine, the easiest way is [Tuning guide](https://docs.emqx.com/en/emqx/latest/performance/tune.html).
 
 
 If you want tune Linux kernel by docker, you must ensure your docker is latest version (>=1.12).
 If you want tune Linux kernel by docker, you must ensure your docker is latest version (>=1.12).
 
 

+ 1 - 1
kibana/README.md

@@ -25,7 +25,7 @@ WARNING:
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
 -	[`8.14.1`](https://github.com/elastic/dockerfiles/blob/69af7042cfc0b32c0d9de82110f15ff8dd74ded8/kibana/Dockerfile)
 -	[`8.14.1`](https://github.com/elastic/dockerfiles/blob/69af7042cfc0b32c0d9de82110f15ff8dd74ded8/kibana/Dockerfile)
--	[`7.17.21`](https://github.com/elastic/dockerfiles/blob/948af89c718b515fa24fa06f6a6890ed32e3b120/kibana/Dockerfile)
+-	[`7.17.22`](https://github.com/elastic/dockerfiles/blob/1f54f19c85034114800de30ef9929c9b52947ffb/kibana/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 1 - 1
logstash/README.md

@@ -25,7 +25,7 @@ WARNING:
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
 -	[`8.14.1`](https://github.com/elastic/dockerfiles/blob/69af7042cfc0b32c0d9de82110f15ff8dd74ded8/logstash/Dockerfile)
 -	[`8.14.1`](https://github.com/elastic/dockerfiles/blob/69af7042cfc0b32c0d9de82110f15ff8dd74ded8/logstash/Dockerfile)
--	[`7.17.21`](https://github.com/elastic/dockerfiles/blob/948af89c718b515fa24fa06f6a6890ed32e3b120/logstash/Dockerfile)
+-	[`7.17.22`](https://github.com/elastic/dockerfiles/blob/1f54f19c85034114800de30ef9929c9b52947ffb/logstash/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)
 
 

+ 8 - 8
rust/README.md

@@ -24,14 +24,14 @@ WARNING:
 
 
 # Supported tags and respective `Dockerfile` links
 # Supported tags and respective `Dockerfile` links
 
 
--	[`1-buster`, `1.78-buster`, `1.78.0-buster`, `buster`](https://github.com/rust-lang/docker-rust/blob/cc31986e1dfe94671c639231ecf0503942c121d9/1.78.0/buster/Dockerfile)
--	[`1-slim-buster`, `1.78-slim-buster`, `1.78.0-slim-buster`, `slim-buster`](https://github.com/rust-lang/docker-rust/blob/cc31986e1dfe94671c639231ecf0503942c121d9/1.78.0/buster/slim/Dockerfile)
--	[`1-bullseye`, `1.78-bullseye`, `1.78.0-bullseye`, `bullseye`](https://github.com/rust-lang/docker-rust/blob/cc31986e1dfe94671c639231ecf0503942c121d9/1.78.0/bullseye/Dockerfile)
--	[`1-slim-bullseye`, `1.78-slim-bullseye`, `1.78.0-slim-bullseye`, `slim-bullseye`](https://github.com/rust-lang/docker-rust/blob/cc31986e1dfe94671c639231ecf0503942c121d9/1.78.0/bullseye/slim/Dockerfile)
--	[`1-bookworm`, `1.78-bookworm`, `1.78.0-bookworm`, `bookworm`, `1`, `1.78`, `1.78.0`, `latest`](https://github.com/rust-lang/docker-rust/blob/cc31986e1dfe94671c639231ecf0503942c121d9/1.78.0/bookworm/Dockerfile)
--	[`1-slim-bookworm`, `1.78-slim-bookworm`, `1.78.0-slim-bookworm`, `slim-bookworm`, `1-slim`, `1.78-slim`, `1.78.0-slim`, `slim`](https://github.com/rust-lang/docker-rust/blob/cc31986e1dfe94671c639231ecf0503942c121d9/1.78.0/bookworm/slim/Dockerfile)
--	[`1-alpine3.19`, `1.78-alpine3.19`, `1.78.0-alpine3.19`, `alpine3.19`](https://github.com/rust-lang/docker-rust/blob/cc31986e1dfe94671c639231ecf0503942c121d9/1.78.0/alpine3.19/Dockerfile)
--	[`1-alpine3.20`, `1.78-alpine3.20`, `1.78.0-alpine3.20`, `alpine3.20`, `1-alpine`, `1.78-alpine`, `1.78.0-alpine`, `alpine`](https://github.com/rust-lang/docker-rust/blob/e2c6ff15ac68eb3ca95d05c491a48127936b40bd/1.78.0/alpine3.20/Dockerfile)
+-	[`1-buster`, `1.79-buster`, `1.79.0-buster`, `buster`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/buster/Dockerfile)
+-	[`1-slim-buster`, `1.79-slim-buster`, `1.79.0-slim-buster`, `slim-buster`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/buster/slim/Dockerfile)
+-	[`1-bullseye`, `1.79-bullseye`, `1.79.0-bullseye`, `bullseye`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/bullseye/Dockerfile)
+-	[`1-slim-bullseye`, `1.79-slim-bullseye`, `1.79.0-slim-bullseye`, `slim-bullseye`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/bullseye/slim/Dockerfile)
+-	[`1-bookworm`, `1.79-bookworm`, `1.79.0-bookworm`, `bookworm`, `1`, `1.79`, `1.79.0`, `latest`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/bookworm/Dockerfile)
+-	[`1-slim-bookworm`, `1.79-slim-bookworm`, `1.79.0-slim-bookworm`, `slim-bookworm`, `1-slim`, `1.79-slim`, `1.79.0-slim`, `slim`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/bookworm/slim/Dockerfile)
+-	[`1-alpine3.19`, `1.79-alpine3.19`, `1.79.0-alpine3.19`, `alpine3.19`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/alpine3.19/Dockerfile)
+-	[`1-alpine3.20`, `1.79-alpine3.20`, `1.79.0-alpine3.20`, `alpine3.20`, `1-alpine`, `1.79-alpine`, `1.79.0-alpine`, `alpine`](https://github.com/rust-lang/docker-rust/blob/ea4aab0935fcafe4956d6206f3ecde84ffddf800/1.79.0/alpine3.20/Dockerfile)
 
 
 # Quick reference (cont.)
 # Quick reference (cont.)