Merge branch 'master' into dev

Author: hardillb

README.md

@@ -29,6 +29,7 @@ Let's dissect that command:
         nodered/node-red        - the image to base it on - currently Node-RED v4.0.0
 
 
+
 Running that command should give a terminal window with a running instance of Node-RED.
 
         Welcome to Node-RED
@@ -115,27 +116,23 @@ The following table shows the variety of provided Node-RED images.
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
 | 4.0.0-18                   |   18   | amd64    |    3.x     |  yes  | amd64/node:18-alpine       |
-|                            |   18   | arm32v6  |    3.x     |  yes  | arm32v6/node:18-alpine     |
 |                            |   18   | arm32v7  |    3.x     |  yes  | arm32v7/node:18-alpine     |
 |                            |   18   | arm64v8  |    3.x     |  yes  | arm64v8/node:18-alpine     |
 |                            |   18   | i386     |    3.x     |  yes  | i386/node:18-alpine        |
 |                            |        |          |            |       |                            |
 | 4.0.0-18-minimal           |   18   | amd64    |     no     |  no   | amd64/node:18-alpine       |
-|                            |   18   | arm32v6  |     no     |  no   | arm32v6/node:18-alpine     |
 |                            |   18   | arm32v7  |     no     |  no   | arm32v7/node:18-alpine     |
 |                            |   18   | arm64v8  |     no     |  no   | arm64v8/node:18-alpine     |
 |                            |   18   | i386     |     no     |  no   | i386/node:18-alpine        |
 
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
 | 4.0.0-20                   |   20   | amd64    |    3.x     |  yes  | amd64/node:20-alpine       |
-|                            |   20   | arm32v6  |    3.x     |  yes  | arm32v6/node:20-alpine     |
 |                            |   20   | arm32v7  |    3.x     |  yes  | arm32v7/node:20-alpine     |
 |                            |   20   | arm64v8  |    3.x     |  yes  | arm64v8/node:20-alpine     |
 |                            |   20   | i386     |    3.x     |  yes  | i386/node:20-alpine        |
 |                            |        |          |            |       |                            |
 | 4.0.0-20-minimal           |   20   | amd64    |     no     |  no   | amd64/node:20-alpine       |
-|                            |   20   | arm32v6  |     no     |  no   | arm32v6/node:20-alpine     |
 |                            |   20   | arm32v7  |     no     |  no   | arm32v7/node:20-alpine     |
 |                            |   20   | arm64v8  |     no     |  no   | arm64v8/node:20-alpine     |
 |                            |   20   | i386     |     no     |  no   | i386/node:20-alpine        |
@@ -144,18 +141,14 @@ The following table shows the variety of provided Node-RED images.
 |                            |   20   | arm32v7  |    3.x     |  yes  | amd64/node:20-buster-slim  |
 |                            |   20   | arm64v8  |    3.x     |  yes  | amd64/node:20-buster-slim  |
 
-Coming when NodeJS v22 is released
-
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
 | 4.0.0-22                   |   22   | amd64    |    3.x     |  yes  | amd64/node:22-alpine       |
-|                            |   22   | arm32v6  |    3.x     |  yes  | arm32v6/node:22-alpine     |
 |                            |   22   | arm32v7  |    3.x     |  yes  | arm32v7/node:22-alpine     |
 |                            |   22   | arm64v8  |    3.x     |  yes  | arm64v8/node:22-alpine     |
 |                            |   22   | i386     |    3.x     |  yes  | i386/node:22-alpine        |
 |                            |        |          |            |       |                            |
 | 4.0.0-22-minimal           |   22   | amd64    |     no     |  no   | amd64/node:22-alpine       |
-|                            |   22   | arm32v6  |     no     |  no   | arm32v6/node:22-alpine     |
 |                            |   22   | arm32v7  |     no     |  no   | arm32v7/node:22-alpine     |
 |                            |   22   | arm64v8  |     no     |  no   | arm64v8/node:22-alpine     |
 |                            |   22   | i386     |     no     |  no   | i386/node:22-alpine        |
@@ -183,11 +176,10 @@ The following table shows the provided Manifest Lists.
 |                                        |                                            |
 | latest-18-minimal, 4.0.0-18-minimal    | nodered/node-red:4.0.0-18-minimal          |
 
-Coming when NodeJS v22 released
 
 | **Tag**                                | **Node-RED Base Image**                    |
 |----------------------------------------|--------------------------------------------|
-| latest-18, 4.0.0-22                    | nodered/node-red:4.0.0-22                  |
+| latest-22, 4.0.0-22                    | nodered/node-red:4.0.0-22                  |
 |                                        |                                            |
 | latest-22-minimal, 4.0.0-22-minimal    | nodered/node-red:4.0.0-22-minimal          
 
@@ -199,6 +191,7 @@ Therefore all tags regarding Raspberry PI's are dropped.
 
 For example: suppose you are running on a Raspberry PI 3B, which has `arm32v7` as architecture. Then just run the following command to pull the image (tagged by `4.0.0-20`), and run the container.
 
+
 ```
 docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red:latest
 ```