Merge pull request #2 from node-red/master

Merge NR Master

Author: hardillb

.docker/Dockerfile.alpine

@@ -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

README.md

@@ -185,8 +185,7 @@ 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-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.
@@ -195,6 +194,7 @@ When a docker run command or docker service command or docker stack command is e
 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.
+
 ```
 docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red:latest
 ```

docker-custom/Dockerfile.custom

@@ -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

docker-custom/package.json

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

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

package.json

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