From 279d38e60018f185dd8292a2f2fc94acbb59cee0 Mon Sep 17 00:00:00 2001 From: knolleary Date: Tue, 18 Jan 2022 09:51:25 +0000 Subject: [PATCH 1/6] Bump to 2.1.6 --- README.md | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 8 ++++++ 2 files changed, 85 insertions(+) diff --git a/README.md b/README.md index bd921b82..a61e2af4 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,7 @@ The following table shows the variety of provided Node-RED images. | **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** | |----------------------------|--------|----------|------------|-------|----------------------------| +<<<<<<< HEAD | 3.0.0-14 | 14 | amd64 | 2.x 3.x | yes | amd64/node:14-alpine | | | 14 | arm32v6 | 2.x 3.x | yes | arm32v6/node:14-alpine | | | 14 | arm32v7 | 2.x 3.x | yes | arm32v7/node:14-alpine | @@ -159,6 +160,53 @@ The following table shows the variety of provided Node-RED images. | | 18 | arm64v8 | no | no | arm64v8/node:18-alpine | | | 18 | s390x | no | no | s390x/node:18-alpine | | | 18 | i386 | no | no | i386/node:18-alpine | +======= +| 2.1.6-12 | 12 | amd64 | 2.x 3.x | yes | amd64/node:12-alpine3.12 | +| | 12 | arm32v6 | 2.x 3.x | yes | arm32v6/node:12-alpine3.12 | +| | 12 | arm32v7 | 2.x 3.x | yes | arm32v7/node:12-alpine3.12 | +| | 12 | arm64v8 | 2.x 3.x | yes | arm64v8/node:12-alpine3.12 | +| | 12 | s390x | 2.x 3.x | yes | s390x/node:12-alpine3.12 | +| | 12 | i386 | 2.x 3.x | yes | i386/node:12-alpine3.12 | +| | | | | | | +| 2.1.6-12-minimal | 12 | amd64 | no | no | amd64/node:12-alpine3.12 | +| | 12 | arm32v6 | no | no | arm32v6/node:12-alpine3.12 | +| | 12 | arm32v7 | no | no | arm32v7/node:12-alpine3.12 | +| | 12 | arm64v8 | no | no | arm64v8/node:12-alpine3.12 | +| | 12 | s390x | no | no | s390x/node:12-alpine3.12 | +| | 12 | i386 | no | no | i386/node:12-alpine3.12 | + +| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** | +|----------------------------|--------|----------|------------|-------|----------------------------| +| 2.1.6-14 | 14 | amd64 | 2.x 3.x | yes | amd64/node:14-alpine3.12 | +| | 14 | arm32v6 | 2.x 3.x | yes | arm32v6/node:14-alpine3.12 | +| | 14 | arm32v7 | 2.x 3.x | yes | arm32v7/node:14-alpine3.12 | +| | 14 | arm64v8 | 2.x 3.x | yes | arm64v8/node:14-alpine3.12 | +| | 14 | s390x | 2.x 3.x | yes | s390x/node:14-alpine3.12 | +| | 14 | i386 | 2.x 3.x | yes | i386/node:14-alpine3.12 | +| | | | | | | +| 2.1.6-14-minimal | 14 | amd64 | no | no | amd64/node:14-alpine3.12 | +| | 14 | arm32v6 | no | no | arm32v6/node:14-alpine3.12 | +| | 14 | arm32v7 | no | no | arm32v7/node:14-alpine3.12 | +| | 14 | arm64v8 | no | no | arm64v8/node:14-alpine3.12 | +| | 14 | s390x | no | no | s390x/node:14-alpine3.12 | +| | 14 | i386 | no | no | i386/node:14-alpine3.12 | + +| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** | +|----------------------------|--------|----------|------------|-------|----------------------------| +| 2.1.6-16 | 16 | amd64 | 2.x 3.x | yes | amd64/node:16-alpine3.12 | +| | 16 | arm32v6 | 2.x 3.x | yes | arm32v6/node:16-alpine3.12 | +| | 16 | arm32v7 | 2.x 3.x | yes | arm32v7/node:16-alpine3.12 | +| | 16 | arm64v8 | 2.x 3.x | yes | arm64v8/node:16-alpine3.12 | +| | 16 | s390x | 2.x 3.x | yes | s390x/node:16-alpine3.12 | +| | 16 | i386 | 2.x 3.x | yes | i386/node:16-alpine3.12 | +| | | | | | | +| 2.1.6-16-minimal | 16 | amd64 | no | no | amd64/node:16-alpine3.12 | +| | 16 | arm32v6 | no | no | arm32v6/node:16-alpine3.12 | +| | 16 | arm32v7 | no | no | arm32v7/node:16-alpine3.12 | +| | 16 | arm64v8 | no | no | arm64v8/node:16-alpine3.12 | +| | 16 | s390x | no | no | s390x/node:16-alpine3.12 | +| | 16 | i386 | no | no | i386/node:16-alpine3.12 | +>>>>>>> 3ae5946 (Bump to 2.1.6) - All images have bash, tzdata, nano, curl, git, openssl and openssh-client pre-installed to support Node-RED's Projects feature. @@ -167,16 +215,26 @@ The following table shows the provided Manifest Lists. | **Tag** | **Node-RED Base Image** | |----------------------------------------|--------------------------------------------| +<<<<<<< HEAD | latest, 3.0.0, | nodered/node-red:3.0.0-16 | | latest-16, 3.0.0-16 | | | | | | | | | latest-minimal, 3.0.0-minimal, | nodered/node-red:3.0.0-16-minimal | | latest-16-minimal, 3.0.0-16-minimal | | +======= +| latest, 2.1.6, | nodered/node-red:2.1.6-14 | +| latest-14, 2.1.6-14 | | +| | | +| | | +| latest-minimal, 2.1.6-minimal, | nodered/node-red:2.1.6-14-minimal | +| latest-14-minimal, 2.1.6-14-minimal | | +>>>>>>> 3ae5946 (Bump to 2.1.6) | **Tag** | **Node-RED Base Image** | |----------------------------------------|--------------------------------------------| +<<<<<<< HEAD | latest-14, 3.0.0-14 | nodered/node-red:3.0.0-12 | | | | | latest-14-minimal, 3.0.0-14-minimal | nodered/node-red:3.0.0-12-minimal | @@ -186,6 +244,17 @@ The following table shows the provided Manifest Lists. | latest-18, 3.0.0-18 | nodered/node-red:3.0.0-18 | | | | | latest-18-minimal, 3.0.0-18-minimal | nodered/node-red:3.0.0-18-minimal | +======= +| latest-12, 2.1.6-12 | nodered/node-red:2.1.6-12 | +| | | +| latest-12-minimal, 2.1.6-12-minimal | nodered/node-red:2.1.6-12-minimal | + +| **Tag** | **Node-RED Base Image** | +|----------------------------------------|--------------------------------------------| +| latest-16, 2.1.6-16 | nodered/node-red:2.1.6-16 | +| | | +| latest-16-minimal, 2.1.6-16-minimal | nodered/node-red:2.1.6-16-minimal | +>>>>>>> 3ae5946 (Bump to 2.1.6) @@ -194,12 +263,20 @@ When a docker run command or docker service command or docker stack command is e Therefore all tags regarding Raspberry PI's are dropped. +<<<<<<< HEAD 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 `3.0.0-16`), and run the container. +======= +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 `2.1.6-14`), and run the container. +>>>>>>> 3ae5946 (Bump to 2.1.6) ``` docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red:latest ``` +<<<<<<< HEAD The same command can be used for running on an amd64 system, since docker discovers its running on a amd64 host and pulls the image with the matching tag (`3.0.0-16-amd64`). +======= +The same command can be used for running on an amd64 system, since docker discovers its running on a amd64 host and pulls the image with the matching tag (`2.1.6-13-amd64`). +>>>>>>> 3ae5946 (Bump to 2.1.6) This gives the advantage that you don't need to know/specify which architecture you are running on and makes docker run commands and docker compose files more flexible and exchangeable across systems. diff --git a/package.json b/package.json index 227f499d..3cda7c98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "node-red-docker", +<<<<<<< HEAD "version": "3.0.0-beta.3", +======= + "version": "2.1.6", +>>>>>>> 3ae5946 (Bump to 2.1.6) "description": "Low-code programming for event-driven applications", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -29,7 +33,11 @@ } ], "dependencies": { +<<<<<<< HEAD "node-red": "3.0.0-beta.3" +======= + "node-red": "2.1.6" +>>>>>>> 3ae5946 (Bump to 2.1.6) }, "engines": { "node": ">=12" From ac1bafafcc7e01550740533f92d5b65fe0cb722e Mon Sep 17 00:00:00 2001 From: knolleary Date: Thu, 27 Jan 2022 13:05:25 +0000 Subject: [PATCH 2/6] Bump to 2.2.0 --- README.md | 77 ---------------------------------------------------- package.json | 8 ++++++ 2 files changed, 8 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index a61e2af4..bd921b82 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,6 @@ The following table shows the variety of provided Node-RED images. | **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** | |----------------------------|--------|----------|------------|-------|----------------------------| -<<<<<<< HEAD | 3.0.0-14 | 14 | amd64 | 2.x 3.x | yes | amd64/node:14-alpine | | | 14 | arm32v6 | 2.x 3.x | yes | arm32v6/node:14-alpine | | | 14 | arm32v7 | 2.x 3.x | yes | arm32v7/node:14-alpine | @@ -160,53 +159,6 @@ The following table shows the variety of provided Node-RED images. | | 18 | arm64v8 | no | no | arm64v8/node:18-alpine | | | 18 | s390x | no | no | s390x/node:18-alpine | | | 18 | i386 | no | no | i386/node:18-alpine | -======= -| 2.1.6-12 | 12 | amd64 | 2.x 3.x | yes | amd64/node:12-alpine3.12 | -| | 12 | arm32v6 | 2.x 3.x | yes | arm32v6/node:12-alpine3.12 | -| | 12 | arm32v7 | 2.x 3.x | yes | arm32v7/node:12-alpine3.12 | -| | 12 | arm64v8 | 2.x 3.x | yes | arm64v8/node:12-alpine3.12 | -| | 12 | s390x | 2.x 3.x | yes | s390x/node:12-alpine3.12 | -| | 12 | i386 | 2.x 3.x | yes | i386/node:12-alpine3.12 | -| | | | | | | -| 2.1.6-12-minimal | 12 | amd64 | no | no | amd64/node:12-alpine3.12 | -| | 12 | arm32v6 | no | no | arm32v6/node:12-alpine3.12 | -| | 12 | arm32v7 | no | no | arm32v7/node:12-alpine3.12 | -| | 12 | arm64v8 | no | no | arm64v8/node:12-alpine3.12 | -| | 12 | s390x | no | no | s390x/node:12-alpine3.12 | -| | 12 | i386 | no | no | i386/node:12-alpine3.12 | - -| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** | -|----------------------------|--------|----------|------------|-------|----------------------------| -| 2.1.6-14 | 14 | amd64 | 2.x 3.x | yes | amd64/node:14-alpine3.12 | -| | 14 | arm32v6 | 2.x 3.x | yes | arm32v6/node:14-alpine3.12 | -| | 14 | arm32v7 | 2.x 3.x | yes | arm32v7/node:14-alpine3.12 | -| | 14 | arm64v8 | 2.x 3.x | yes | arm64v8/node:14-alpine3.12 | -| | 14 | s390x | 2.x 3.x | yes | s390x/node:14-alpine3.12 | -| | 14 | i386 | 2.x 3.x | yes | i386/node:14-alpine3.12 | -| | | | | | | -| 2.1.6-14-minimal | 14 | amd64 | no | no | amd64/node:14-alpine3.12 | -| | 14 | arm32v6 | no | no | arm32v6/node:14-alpine3.12 | -| | 14 | arm32v7 | no | no | arm32v7/node:14-alpine3.12 | -| | 14 | arm64v8 | no | no | arm64v8/node:14-alpine3.12 | -| | 14 | s390x | no | no | s390x/node:14-alpine3.12 | -| | 14 | i386 | no | no | i386/node:14-alpine3.12 | - -| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** | -|----------------------------|--------|----------|------------|-------|----------------------------| -| 2.1.6-16 | 16 | amd64 | 2.x 3.x | yes | amd64/node:16-alpine3.12 | -| | 16 | arm32v6 | 2.x 3.x | yes | arm32v6/node:16-alpine3.12 | -| | 16 | arm32v7 | 2.x 3.x | yes | arm32v7/node:16-alpine3.12 | -| | 16 | arm64v8 | 2.x 3.x | yes | arm64v8/node:16-alpine3.12 | -| | 16 | s390x | 2.x 3.x | yes | s390x/node:16-alpine3.12 | -| | 16 | i386 | 2.x 3.x | yes | i386/node:16-alpine3.12 | -| | | | | | | -| 2.1.6-16-minimal | 16 | amd64 | no | no | amd64/node:16-alpine3.12 | -| | 16 | arm32v6 | no | no | arm32v6/node:16-alpine3.12 | -| | 16 | arm32v7 | no | no | arm32v7/node:16-alpine3.12 | -| | 16 | arm64v8 | no | no | arm64v8/node:16-alpine3.12 | -| | 16 | s390x | no | no | s390x/node:16-alpine3.12 | -| | 16 | i386 | no | no | i386/node:16-alpine3.12 | ->>>>>>> 3ae5946 (Bump to 2.1.6) - All images have bash, tzdata, nano, curl, git, openssl and openssh-client pre-installed to support Node-RED's Projects feature. @@ -215,26 +167,16 @@ The following table shows the provided Manifest Lists. | **Tag** | **Node-RED Base Image** | |----------------------------------------|--------------------------------------------| -<<<<<<< HEAD | latest, 3.0.0, | nodered/node-red:3.0.0-16 | | latest-16, 3.0.0-16 | | | | | | | | | latest-minimal, 3.0.0-minimal, | nodered/node-red:3.0.0-16-minimal | | latest-16-minimal, 3.0.0-16-minimal | | -======= -| latest, 2.1.6, | nodered/node-red:2.1.6-14 | -| latest-14, 2.1.6-14 | | -| | | -| | | -| latest-minimal, 2.1.6-minimal, | nodered/node-red:2.1.6-14-minimal | -| latest-14-minimal, 2.1.6-14-minimal | | ->>>>>>> 3ae5946 (Bump to 2.1.6) | **Tag** | **Node-RED Base Image** | |----------------------------------------|--------------------------------------------| -<<<<<<< HEAD | latest-14, 3.0.0-14 | nodered/node-red:3.0.0-12 | | | | | latest-14-minimal, 3.0.0-14-minimal | nodered/node-red:3.0.0-12-minimal | @@ -244,17 +186,6 @@ The following table shows the provided Manifest Lists. | latest-18, 3.0.0-18 | nodered/node-red:3.0.0-18 | | | | | latest-18-minimal, 3.0.0-18-minimal | nodered/node-red:3.0.0-18-minimal | -======= -| latest-12, 2.1.6-12 | nodered/node-red:2.1.6-12 | -| | | -| latest-12-minimal, 2.1.6-12-minimal | nodered/node-red:2.1.6-12-minimal | - -| **Tag** | **Node-RED Base Image** | -|----------------------------------------|--------------------------------------------| -| latest-16, 2.1.6-16 | nodered/node-red:2.1.6-16 | -| | | -| latest-16-minimal, 2.1.6-16-minimal | nodered/node-red:2.1.6-16-minimal | ->>>>>>> 3ae5946 (Bump to 2.1.6) @@ -263,20 +194,12 @@ When a docker run command or docker service command or docker stack command is e Therefore all tags regarding Raspberry PI's are dropped. -<<<<<<< HEAD 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 `3.0.0-16`), and run the container. -======= -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 `2.1.6-14`), and run the container. ->>>>>>> 3ae5946 (Bump to 2.1.6) ``` docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red:latest ``` -<<<<<<< HEAD The same command can be used for running on an amd64 system, since docker discovers its running on a amd64 host and pulls the image with the matching tag (`3.0.0-16-amd64`). -======= -The same command can be used for running on an amd64 system, since docker discovers its running on a amd64 host and pulls the image with the matching tag (`2.1.6-13-amd64`). ->>>>>>> 3ae5946 (Bump to 2.1.6) This gives the advantage that you don't need to know/specify which architecture you are running on and makes docker run commands and docker compose files more flexible and exchangeable across systems. diff --git a/package.json b/package.json index 3cda7c98..52bc17b9 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,14 @@ { "name": "node-red-docker", +<<<<<<< HEAD <<<<<<< HEAD "version": "3.0.0-beta.3", ======= "version": "2.1.6", >>>>>>> 3ae5946 (Bump to 2.1.6) +======= + "version": "2.2.0", +>>>>>>> 6c4b0f9 (Bump to 2.2.0) "description": "Low-code programming for event-driven applications", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -33,11 +37,15 @@ } ], "dependencies": { +<<<<<<< HEAD <<<<<<< HEAD "node-red": "3.0.0-beta.3" ======= "node-red": "2.1.6" >>>>>>> 3ae5946 (Bump to 2.1.6) +======= + "node-red": "2.2.0" +>>>>>>> 6c4b0f9 (Bump to 2.2.0) }, "engines": { "node": ">=12" From 10ed5dd5ce444ce455e10856df683dbdabf40616 Mon Sep 17 00:00:00 2001 From: knolleary Date: Tue, 15 Feb 2022 13:51:38 +0000 Subject: [PATCH 3/6] Bump to 2.2.1 --- package.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/package.json b/package.json index 52bc17b9..227f499d 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,6 @@ { "name": "node-red-docker", -<<<<<<< HEAD -<<<<<<< HEAD "version": "3.0.0-beta.3", -======= - "version": "2.1.6", ->>>>>>> 3ae5946 (Bump to 2.1.6) -======= - "version": "2.2.0", ->>>>>>> 6c4b0f9 (Bump to 2.2.0) "description": "Low-code programming for event-driven applications", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -37,15 +29,7 @@ } ], "dependencies": { -<<<<<<< HEAD -<<<<<<< HEAD "node-red": "3.0.0-beta.3" -======= - "node-red": "2.1.6" ->>>>>>> 3ae5946 (Bump to 2.1.6) -======= - "node-red": "2.2.0" ->>>>>>> 6c4b0f9 (Bump to 2.2.0) }, "engines": { "node": ">=12" From 403e8ee4a04aa0f42fa3259e19cb1201427fd09c Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 21 Apr 2022 10:50:10 +0100 Subject: [PATCH 4/6] Updates for 3.0.0 - Bump the base Alpine build back to latest - Set NodeJS 16 as default - Drop NodeJS 12 - Add NodeJS 18 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bd921b82..f5656ab4 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,7 @@ The following table shows the variety of provided Node-RED images. | | 18 | s390x | no | no | s390x/node:18-alpine | | | 18 | i386 | no | no | i386/node:18-alpine | + - All images have bash, tzdata, nano, curl, git, openssl and openssh-client pre-installed to support Node-RED's Projects feature. ## Manifest Lists From d596e2ee83631823c17e7904d21b8811460605a3 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 30 Jun 2022 09:46:50 +0100 Subject: [PATCH 5/6] Bump to 3.0.0-beta.4 --- docker-custom/package.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-custom/package.json b/docker-custom/package.json index 04b796eb..28c2b6e0 100644 --- a/docker-custom/package.json +++ b/docker-custom/package.json @@ -1,6 +1,6 @@ { "name": "node-red-docker", - "version": "3.0.0-beta.3", + "version": "3.0.0-beta.4", "description": "Low-code programming for event-driven applications", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -29,7 +29,7 @@ } ], "dependencies": { - "node-red": "3.0.0-beta.3" + "node-red": "3.0.0-beta.4" }, "engines": { "node": ">=12" diff --git a/package.json b/package.json index 227f499d..38e9e446 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-docker", - "version": "3.0.0-beta.3", + "version": "3.0.0-beta.4", "description": "Low-code programming for event-driven applications", "homepage": "http://nodered.org", "license": "Apache-2.0", @@ -29,7 +29,7 @@ } ], "dependencies": { - "node-red": "3.0.0-beta.3" + "node-red": "3.0.0-beta.4" }, "engines": { "node": ">=12" From 42f3aaacec6e260448e4a21e8bf711b8572e7da7 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 30 Jun 2022 10:04:46 +0100 Subject: [PATCH 6/6] Remove new empty line --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f5656ab4..bd921b82 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,6 @@ The following table shows the variety of provided Node-RED images. | | 18 | s390x | no | no | s390x/node:18-alpine | | | 18 | i386 | no | no | i386/node:18-alpine | - - All images have bash, tzdata, nano, curl, git, openssl and openssh-client pre-installed to support Node-RED's Projects feature. ## Manifest Lists