Merge 3.0.0 work into master (#317)

hardillb · knolleary · web-flow · commit 3d02ac51c8d5 · 2022-07-14T09:18:21.000+01:00
* 2.2.0-beta.1 * Updates for NR 3.0.0 release (#311) * Updates for 3.0.0 - Bump the base Alpine build back to latest - Set NodeJS 16 as default - Drop NodeJS 12 - Add NodeJS 18 * Finish updating README.md * Update default versions in custom build scripts * Add 3.0.0-beta.1 * Bump to 3.0.0-beta.2 * Bump dev to 3.0.0-beta.3 (#314) * Remove Python 2 (#315) * Bump dev to 3.0.0-beta.3 * Remove Python2 from alpine builds * Bump to 3.0.0-beta.4 (#316) * Bump to 2.1.6 * Bump to 2.2.0 * Bump to 2.2.1 * Updates for 3.0.0 - Bump the base Alpine build back to latest - Set NodeJS 16 as default - Drop NodeJS 12 - Add NodeJS 18 * Bump to 3.0.0-beta.4 * Remove new empty line Co-authored-by: knolleary <knolleary@users.noreply.github.com> Co-authored-by: Nick O'Leary <nick.oleary@gmail.com> Co-authored-by: knolleary <knolleary@users.noreply.github.com>
diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine
@@ -1,5 +1,5 @@
-ARG NODE_VERSION=14
-ARG OS=alpine3.12
+ARG NODE_VERSION=16
+ARG OS=alpine
 
 #### Stage BASE ########################################################################################################
 FROM node:${NODE_VERSION}-${OS} AS base
@@ -44,7 +44,7 @@ COPY flows.json /data
 FROM base AS build
 
 # Install Build tools
-RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python2 && \
+RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python3 && \
     npm install --unsafe-perm --no-update-notifier --no-audit --no-fund --only=production && \
     /tmp/remove_native_gpio.sh && \
     cp -R node_modules prod_node_modules
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,14 +14,14 @@ jobs:
   build:
     env:
       # Setting the defaults up front
-      LATEST_NODE: 14
+      LATEST_NODE: 16
       DEFAULT_IMAGE: nodered/node-red
       DEV_IMAGE: nodered/node-red-dev
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node: [12, 14, 16]
+        node: [14, 16, 18]
         suffix: ["", "-minimal"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
diff --git a/README.md b/README.md
@@ -26,16 +26,16 @@ Let's dissect that command:
         -p 1880:1880            - connect local port 1880 to the exposed internal port 1880
         -v node_red_data:/data  - mount the host node_red_data directory to the container /data directory so any changes made to flows are persisted
         --name mynodered        - give this machine a friendly local name
-        nodered/node-red        - the image to base it on - currently Node-RED v2.2.2
+        nodered/node-red        - the image to base it on - currently Node-RED v3.0.0
 
 
 Running that command should give a terminal window with a running instance of Node-RED.
 
         Welcome to Node-RED
         ===================
 
-        10 Oct 12:57:10 - [info] Node-RED version: v2.2.2
-        10 Oct 12:57:10 - [info] Node.js  version: v14.18.2
+        10 Oct 12:57:10 - [info] Node-RED version: v3.0.0
+        10 Oct 12:57:10 - [info] Node.js  version: v16.14.1
         10 Oct 12:57:10 - [info] Linux 4.19.76-linuxkit x64 LE
         10 Oct 12:57:11 - [info] Loading palette nodes
         10 Oct 12:57:16 - [info] Settings file  : /data/settings.js
@@ -114,92 +114,92 @@ The following table shows the variety of provided Node-RED images.
 
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
-| 2.2.2-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    |
+| 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     |
+|                            |   14   | arm64v8  |   2.x 3.x  |  yes  | arm64v8/node:14-alpine     |
+|                            |   14   | s390x    |   2.x 3.x  |  yes  | s390x/node:14-alpine       |
+|                            |   14   | i386     |   2.x 3.x  |  yes  | i386/node:14-alpine        |
 |                            |        |          |            |       |                            |
-| 2.2.2-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    |
+| 3.0.0-14-minimal           |   14   | amd64    |     no     |  no   | amd64/node:14-alpine       |
+|                            |   14   | arm32v6  |     no     |  no   | arm32v6/node:14-alpine     |
+|                            |   14   | arm32v7  |     no     |  no   | arm32v7/node:14-alpine     |
+|                            |   14   | arm64v8  |     no     |  no   | arm64v8/node:14-alpine     |
+|                            |   14   | s390x    |     no     |  no   | s390x/node:14-alpine       |
+|                            |   14   | i386     |     no     |  no   | i386/node:14-alpine        |
 
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
-| 2.2.2-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    |
+| 3.0.0-16                   |   14   | amd64    |   2.x 3.x  |  yes  | amd64/node:16-alpine       |
+|                            |   14   | arm32v6  |   2.x 3.x  |  yes  | arm32v6/node:16-alpine     |
+|                            |   14   | arm32v7  |   2.x 3.x  |  yes  | arm32v7/node:16-alpine     |
+|                            |   14   | arm64v8  |   2.x 3.x  |  yes  | arm64v8/node:16-alpine     |
+|                            |   14   | s390x    |   2.x 3.x  |  yes  | s390x/node:16-alpine       |
+|                            |   14   | i386     |   2.x 3.x  |  yes  | i386/node:16-alpine        |
 |                            |        |          |            |       |                            |
-| 2.2.2-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    |
+| 3.0.0-16-minimal           |   14   | amd64    |     no     |  no   | amd64/node:14-alpine       |
+|                            |   14   | arm32v6  |     no     |  no   | arm32v6/node:14-alpine     |
+|                            |   14   | arm32v7  |     no     |  no   | arm32v7/node:14-alpine     |
+|                            |   14   | arm64v8  |     no     |  no   | arm64v8/node:14-alpine     |
+|                            |   14   | s390x    |     no     |  no   | s390x/node:14-alpine       |
+|                            |   14   | i386     |     no     |  no   | i386/node:14-alpine        |
 
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
-| 2.2.2-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    |
+| 3.0.0-18                   |   18   | amd64    |   2.x 3.x  |  yes  | amd64/node:18-alpine       |
+|                            |   18   | arm32v6  |   2.x 3.x  |  yes  | arm32v6/node:18-alpine     |
+|                            |   18   | arm32v7  |   2.x 3.x  |  yes  | arm32v7/node:18-alpine     |
+|                            |   18   | arm64v8  |   2.x 3.x  |  yes  | arm64v8/node:18-alpine     |
+|                            |   18   | s390x    |   2.x 3.x  |  yes  | s390x/node:18-alpine       |
+|                            |   18   | i386     |   2.x 3.x  |  yes  | i386/node:18-alpine        |
 |                            |        |          |            |       |                            |
-| 2.2.2-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    |
-
+| 3.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   | 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
 The following table shows the provided Manifest Lists.
 
 | **Tag**                                | **Node-RED Base Image**                    |
 |----------------------------------------|--------------------------------------------|
-| latest, 2.2.2,                         | nodered/node-red:2.2.2-14                  |
-| latest-14, 2.2.2-14                    |                                            |
+| latest, 3.0.0,                         | nodered/node-red:3.0.0-16                  |
+| latest-16, 3.0.0-16                    |                                            |
 |                                        |                                            |
 |                                        |                                            |
-| latest-minimal, 2.2.2-minimal,         | nodered/node-red:2.2.2-14-minimal          |
-| latest-14-minimal, 2.2.2-14-minimal    |                                            |
+| latest-minimal, 3.0.0-minimal,         | nodered/node-red:3.0.0-16-minimal          |
+| latest-16-minimal, 3.0.0-16-minimal    |                                            |
 
 
 | **Tag**                                | **Node-RED Base Image**                    |
 |----------------------------------------|--------------------------------------------|
-| latest-12, 2.2.2-12                    | nodered/node-red:2.2.2-12                  |
+| latest-14, 3.0.0-14                    | nodered/node-red:3.0.0-12                  |
 |                                        |                                            |
-| latest-12-minimal, 2.2.2-12-minimal    | nodered/node-red:2.2.2-12-minimal          |
+| latest-14-minimal, 3.0.0-14-minimal    | nodered/node-red:3.0.0-12-minimal          |
 
 | **Tag**                                | **Node-RED Base Image**                    |
 |----------------------------------------|--------------------------------------------|
-| latest-16, 2.2.2-16                    | nodered/node-red:2.2.2-16                  |
+| latest-18, 3.0.0-18                    | nodered/node-red:3.0.0-18                  |
 |                                        |                                            |
-| latest-16-minimal, 2.2.2-16-minimal    | nodered/node-red:2.2.2-16-minimal          |
-
+| latest-18-minimal, 3.0.0-18-minimal    | nodered/node-red:3.0.0-18-minimal          
 
 
 With the support of Docker manifest list, there is no need to explicitly add the tag for the architecture to use.
 When a docker run command or docker service command or docker stack command is executed, docker checks which architecture is required and verifies if it is available in the docker repository. If it does, docker pulls the matching image for it.
 
 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 `2.2.2-14`), 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 `3.0.0-16`), and run the container.
+
 ```
 docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red:latest
 ```
 
-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.2.2-13-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 (`3.0.0-16-amd64`).
 
 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.
 
@@ -334,7 +334,7 @@ Docker build process, the dependencies are installed under `/usr/src/node-red`.
 The main sections to modify are
 
     "dependencies": {
-        "node-red": "^2.2.2",           <-- set the version of Node-RED here
+        "node-red": "^3.0.0",           <-- set the version of Node-RED here
         "node-red-dashboard": "*"        <-- add any extra npm packages here
     },
 
diff --git a/docker-custom/Dockerfile.custom b/docker-custom/Dockerfile.custom
@@ -1,6 +1,6 @@
 ARG ARCH=amd64
-ARG NODE_VERSION=14
-ARG OS=alpine3.12
+ARG NODE_VERSION=16
+ARG OS=alpine
 
 #### Stage BASE ########################################################################################################
 FROM ${ARCH}/node:${NODE_VERSION}-${OS} AS base
@@ -43,7 +43,7 @@ COPY flows.json /data
 FROM base AS build
 
 # Install Build tools
-RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python2 && \
+RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python3 && \
     npm install --unsafe-perm --no-update-notifier --no-fund --only=production && \
     /tmp/remove_native_gpio.sh && \
     cp -R node_modules prod_node_modules
diff --git a/docker-custom/Dockerfile.debian b/docker-custom/Dockerfile.debian
@@ -1,5 +1,5 @@
 ARG ARCH=amd64
-ARG NODE_VERSION=14
+ARG NODE_VERSION=16
 ARG OS=buster-slim
 
 #### Stage BASE ########################################################################################################
diff --git a/docker-custom/docker-alpine.sh b/docker-custom/docker-alpine.sh
@@ -7,9 +7,9 @@ echo "#########################################################################"
 
 docker build --rm --no-cache \
     --build-arg ARCH=amd64 \
-    --build-arg NODE_VERSION=14 \
+    --build-arg NODE_VERSION=16 \
     --build-arg NODE_RED_VERSION=${NODE_RED_VERSION} \
-    --build-arg OS=alpine3.12 \
+    --build-arg OS=alpine \
     --build-arg BUILD_DATE="$(date +"%Y-%m-%dT%H:%M:%SZ")" \
     --build-arg TAG_SUFFIX=default \
     --file Dockerfile.custom \
diff --git a/docker-custom/docker-debian.sh b/docker-custom/docker-debian.sh
@@ -7,7 +7,7 @@ echo "#########################################################################"
 
 docker build --rm --no-cache \
     --build-arg ARCH=amd64 \
-    --build-arg NODE_VERSION=14 \
+    --build-arg NODE_VERSION=16 \
     --build-arg NODE_RED_VERSION=${NODE_RED_VERSION} \
     --build-arg OS=buster-slim \
     --build-arg BUILD_DATE="$(date +"%Y-%m-%dT%H:%M:%SZ")" \
diff --git a/docker-custom/package.json b/docker-custom/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-docker",
-    "version": "2.2.2",
+    "version": "3.0.0",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -29,7 +29,7 @@
         }
     ],
     "dependencies": {
-        "node-red": "2.2.2"
+        "node-red": "3.0.0"
     },
     "engines": {
         "node": ">=12"
diff --git a/docker-custom/scripts/install_devtools.sh b/docker-custom/scripts/install_devtools.sh
@@ -4,7 +4,7 @@ set -ex
 # Installing Devtools
 if [[ ${TAG_SUFFIX} != *"minimal" ]]; then
   echo "Installing devtools"
-  apk add --no-cache --virtual devtools build-base linux-headers udev python2 python3
+  apk add --no-cache --virtual devtools build-base linux-headers udev python3
 else
   echo "Skip installing devtools"
 fi
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-docker",
-    "version": "2.2.2",
+    "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": "2.2.2"
+        "node-red": "3.0.0"
     },
     "engines": {
         "node": ">=12"
