Sync master to dev (#350)

* 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

* Merge 3.0.0 work into master (#317)

* 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 <[email protected]>

Co-authored-by: Nick O'Leary <[email protected]>
Co-authored-by: knolleary <[email protected]>

* Bump to 3.0.0 (#318)

Co-authored-by: knolleary <[email protected]>

* Add PubkeyAccessKeyTypes settings (#323)

* Add PubkeyAccessKeyTypes settings

* Add PubkeyAccessKeyTypes settings

* Add ssh fix to debian based build

* New entrypoint (#324)

* Add PubkeyAccessKeyTypes settings

* Switch entrypoint to allow NR to run as root if needed

This works round npm droping uid when running as root

* Bump to 3.0.1

* First pass at fix for #326 (#327)

Fix for #326

* Bump to 3.0.2

* Fix NODE_OPTIONS (#334)

Thanks to @twocolors for finding this, applying from my id as having problems with easycla

* Set python3 to be the default python for npm (#336)

* Add stable release tag (#342)

* Add a stable tag

All 3.0.x will be tagged as nodered/node-red:3.0
All 3.1.x will be tagged as nodered/node-red:3.1

* Calculate Stable version rather than hard code it

* Fix passing cli args to Node-RED (#349)

The new entrypoint introduced #324 does not forward arguments to Node-RED. (which is a breaking change from 3.0.0)

With this change the old behavior is restored and one can override settings via the docker command again.

---------

Co-authored-by: Nick O'Leary <[email protected]>
Co-authored-by: knolleary <[email protected]>
Co-authored-by: NodeREDBot <[email protected]>
Co-authored-by: Dominik Schmidt <[email protected]>

Author: 4 people

.docker/Dockerfile.alpine

@@ -35,10 +35,12 @@ WORKDIR /usr/src/node-red
 # Setup SSH known_hosts file
 COPY .docker/known_hosts.sh .
 RUN ./known_hosts.sh /etc/ssh/ssh_known_hosts && rm /usr/src/node-red/known_hosts.sh
+RUN echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> /etc/ssh/ssh_config
 
 # package.json contains Node-RED NPM module and node dependencies
 COPY package.json .
 COPY flows.json /data
+COPY .docker/scripts/entrypoint.sh .
 
 #### Stage BUILD #######################################################################################################
 FROM base AS build
@@ -79,6 +81,9 @@ RUN chown -R node-red:root /usr/src/node-red && \
     /tmp/install_devtools.sh && \
     rm -r /tmp/*
 
+RUN npm config set cache /data/.npm --global
+RUN npm config set python `which python3` --global
+
 USER node-red
 
 # Env variables
@@ -96,4 +101,4 @@ EXPOSE 1880
 # Add a healthcheck (default every 30 secs)
 HEALTHCHECK CMD node /healthcheck.js
 
-ENTRYPOINT ["npm", "--no-update-notifier", "--no-fund", "start", "--cache", "/data/.npm", "--", "--userDir", "/data"]
+ENTRYPOINT ["./entrypoint.sh"]

.docker/scripts/entrypoint.sh

@@ -0,0 +1 @@
+../../docker-custom/scripts/entrypoint.sh

.github/workflows/main.yml

@@ -71,9 +71,10 @@ jobs:
             IMAGE=${{ env.DEFAULT_IMAGE }}
             PUSH="true"
             VERSION=${TRAVIS_TAG:1}
+            STABLE_VERSION=`echo ${VERSION} | sed -r 's/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$/\1.\2/'`
 
             if [[ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" && "${{ matrix.suffix }}" == "" ]]; then
-              TAGS="$TAGS,$IMAGE:$VERSION,$IMAGE:latest"
+              TAGS="$TAGS,$IMAGE:$VERSION,$IMAGE:$STABLE_VERSION,$IMAGE:latest"
             elif [[ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" &&  "${{ matrix.suffix }}" == "-minimal" ]]; then
               TAGS="$TAGS,$IMAGE:$VERSION-minimal,$IMAGE:latest-minimal"
             fi

README.md

@@ -26,15 +26,15 @@ 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 v3.0.0
+        nodered/node-red        - the image to base it on - currently Node-RED v3.0.2
 
 
 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: v3.0.0
+        10 Oct 12:57:10 - [info] Node-RED version: v3.0.2
         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
@@ -114,14 +114,14 @@ The following table shows the variety of provided Node-RED images.
 
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
-| 3.0.0-14                   |   14   | amd64    |   2.x 3.x  |  yes  | amd64/node:14-alpine       |
+| 3.0.2-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        |
 |                            |        |          |            |       |                            |
-| 3.0.0-14-minimal           |   14   | amd64    |     no     |  no   | amd64/node:14-alpine       |
+| 3.0.2-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     |
@@ -130,14 +130,14 @@ The following table shows the variety of provided Node-RED images.
 
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
-| 3.0.0-16                   |   14   | amd64    |   2.x 3.x  |  yes  | amd64/node:16-alpine       |
+| 3.0.2-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        |
 |                            |        |          |            |       |                            |
-| 3.0.0-16-minimal           |   14   | amd64    |     no     |  no   | amd64/node:14-alpine       |
+| 3.0.2-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     |
@@ -146,60 +146,60 @@ The following table shows the variety of provided Node-RED images.
 
 | **Tag**                    |**Node**| **Arch** | **Python** |**Dev**| **Base Image**             |
 |----------------------------|--------|----------|------------|-------|----------------------------|
-| 3.0.0-18                   |   18   | amd64    |   2.x 3.x  |  yes  | amd64/node:18-alpine       |
+| 3.0.2-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        |
 |                            |        |          |            |       |                            |
-| 3.0.0-18-minimal           |   18   | amd64    |     no     |  no   | amd64/node:18-alpine       |
+| 3.0.2-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, 3.0.0,                         | nodered/node-red:3.0.0-16                  |
-| latest-16, 3.0.0-16                    |                                            |
+| latest, 3.0.2,                         | nodered/node-red:3.0.2-16                  |
+| latest-16, 3.0.2-16                    |                                            |
 |                                        |                                            |
 |                                        |                                            |
-| latest-minimal, 3.0.0-minimal,         | nodered/node-red:3.0.0-16-minimal          |
-| latest-16-minimal, 3.0.0-16-minimal    |                                            |
+| latest-minimal, 3.0.2-minimal,         | nodered/node-red:3.0.2-16-minimal          |
+| latest-16-minimal, 3.0.2-16-minimal    |                                            |
 
 
 | **Tag**                                | **Node-RED Base Image**                    |
 |----------------------------------------|--------------------------------------------|
-| latest-14, 3.0.0-14                    | nodered/node-red:3.0.0-12                  |
+| latest-14, 3.0.2-14                    | nodered/node-red:3.0.2-12                  |
 |                                        |                                            |
-| latest-14-minimal, 3.0.0-14-minimal    | nodered/node-red:3.0.0-12-minimal          |
+| latest-14-minimal, 3.0.2-14-minimal    | nodered/node-red:3.0.2-12-minimal          |
 
 | **Tag**                                | **Node-RED Base Image**                    |
 |----------------------------------------|--------------------------------------------|
-| latest-18, 3.0.0-18                    | nodered/node-red:3.0.0-18                  |
+| latest-18, 3.0.2-18                    | nodered/node-red:3.0.2-18                  |
 |                                        |                                            |
-| latest-18-minimal, 3.0.0-18-minimal    | nodered/node-red:3.0.0-18-minimal          
+| latest-18-minimal, 3.0.2-18-minimal    | nodered/node-red:3.0.2-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 `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 `3.0.2-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 (`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 (`3.0.2-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": "^3.0.0",           <-- set the version of Node-RED here
+        "node-red": "^3.0.2",           <-- set the version of Node-RED here
         "node-red-dashboard": "*"        <-- add any extra npm packages here
     },
 

docker-custom/Dockerfile.custom

@@ -34,10 +34,12 @@ WORKDIR /usr/src/node-red
 # Setup SSH known_hosts file
 COPY known_hosts.sh .
 RUN ./known_hosts.sh /etc/ssh/ssh_known_hosts && rm /usr/src/node-red/known_hosts.sh
+RUN echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> /etc/ssh/ssh_config
 
 # package.json contains Node-RED NPM module and node dependencies
 COPY package.json .
 COPY flows.json /data
+COPY scripts/entrypoint.sh .
 
 #### Stage BUILD #######################################################################################################
 FROM base AS build
@@ -77,6 +79,9 @@ RUN chown -R node-red:root /usr/src/node-red && \
     /tmp/install_devtools.sh && \
     rm -r /tmp/*
 
+RUN npm config set cache /data/.npm --global 
+RUN npm config set python `which python3` --global
+
 USER node-red
 
 # Env variables
@@ -94,4 +99,5 @@ EXPOSE 1880
 # Add a healthcheck (default every 30 secs)
 # HEALTHCHECK CMD curl http://localhost:1880/ || exit 1
 
-ENTRYPOINT ["npm", "start", "--cache", "/data/.npm", "--", "--userDir", "/data"]
+# ENTRYPOINT ["npm", "start", "--cache", "/data/.npm", "--", "--userDir", "/data"]
+ENTRYPOINT ["./entrypoint.sh"]

docker-custom/Dockerfile.debian

@@ -35,10 +35,12 @@ WORKDIR /usr/src/node-red
 # Setup SSH known_hosts file
 COPY known_hosts.sh .
 RUN ./known_hosts.sh /etc/ssh/ssh_known_hosts && rm /usr/src/node-red/known_hosts.sh
+RUN echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> /etc/ssh/ssh_config
 
 # package.json contains Node-RED NPM module and node dependencies
 COPY package.json .
 COPY flows.json /data
+COPY scripts/entrypoint.sh .
 
 #### Stage BUILD #######################################################################################################
 FROM base AS build
@@ -78,6 +80,9 @@ RUN chown -R node-red:root /usr/src/node-red && \
     apt-get update && apt-get install -y build-essential python-dev python3 && \
     rm -r /tmp/*
 
+RUN npm config set cache /data/.npm --global
+RUN npm config set python `which python3` --global
+
 USER node-red
 
 # Env variables
@@ -95,4 +100,4 @@ EXPOSE 1880
 # Add a healthcheck (default every 30 secs)
 # HEALTHCHECK CMD curl http://localhost:1880/ || exit 1
 
-ENTRYPOINT ["npm", "start", "--cache", "/data/.npm", "--", "--userDir", "/data"]
+ENTRYPOINT ["./entrypoint.sh"]

docker-custom/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-docker",
-    "version": "3.0.0",
+    "version": "3.0.2",
     "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"
+        "node-red": "3.0.2"
     },
     "engines": {
         "node": ">=12"

docker-custom/scripts/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+trap stop SIGINT SIGTERM
+
+function stop() {
+	kill $CHILD_PID
+	wait $CHILD_PID
+}
+
+/usr/local/bin/node $NODE_OPTIONS node_modules/node-red/red.js --userDir /data $FLOWS "${@}" &
+
+CHILD_PID="$!"
+
+wait "${CHILD_PID}"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-docker",
-    "version": "3.0.0-beta.4",
+    "version": "3.0.2",
     "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"
+        "node-red": "3.0.2"
     },
     "engines": {
         "node": ">=12"