From a05bc3992e7c29ac4d7f63b191a1d7e6378f03b5 Mon Sep 17 00:00:00 2001
From: Phill Kelley <34226495+Paraphraser@users.noreply.github.com>
Date: Tue, 30 Jul 2024 21:38:00 +1000
Subject: [PATCH] 2024-07-30 Node-RED - master branch - PR 1 of 2

Harmonises list of add-on nodes across old-menu and master branches.
I've tried to stay away from #755. This includes removal of
`node-red-node-rbe` which has been replaced by the built-in Filter
node.  See:

- [Release notes](https://nodered.org/blog/2021/07/20/version-2-0-released#renamed-rbe-node-to-filter-node)

Migrate from `node-red-contrib-themes/midnight-red` (deprecated) to
`@node-red-contrib-themes/theme-collection` which supports many more
themes. See:

- [Node-RED themes list](https://github.com/node-red-contrib-themes/theme-collection#theme-list)

Modify Dockerfile template:

1. No need to declare `EXTRA_PACKAGES` as an environment variable. It
   isn't needed in the container. The `ARG` reference is sufficient.

2. Remove redundant `apk update` command. The `--no-cache` flag on the
   `apk add` handles both package-list updates and their removal. It
   makes for a slightly smaller container.

   I discovered (and tested) this behaviour when posting a reply to:

   - [node-red-docker issue 338](https://github.com/node-red/node-red-docker/issues/338).

Signed-off-by: Phill Kelley <34226495+Paraphraser@users.noreply.github.com>
---
 .templates/nodered/Dockerfile.template |  6 +-----
 .templates/nodered/addons.yml          | 10 +++++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.templates/nodered/Dockerfile.template b/.templates/nodered/Dockerfile.template
index 556e7d63a..8b782c751 100755
--- a/.templates/nodered/Dockerfile.template
+++ b/.templates/nodered/Dockerfile.template
@@ -6,20 +6,16 @@ FROM nodered/node-red:${DOCKERHUB_TAG}
 
 # reference argument - omitted defaults to null
 ARG EXTRA_PACKAGES
-ENV EXTRA_PACKAGES=${EXTRA_PACKAGES}
 
 # default user is node-red - need to be root to install packages
 USER root
 
 # install packages
-RUN apk update && apk add --no-cache eudev-dev ${EXTRA_PACKAGES}
+RUN apk add --no-cache eudev-dev ${EXTRA_PACKAGES}
 
 # switch back to default user
 USER node-red
 
-# variable not needed inside running container
-ENV EXTRA_PACKAGES=
-
 # add-on nodes follow
 
 %run npm install modules list%
diff --git a/.templates/nodered/addons.yml b/.templates/nodered/addons.yml
index e4457d31e..e7657e013 100644
--- a/.templates/nodered/addons.yml
+++ b/.templates/nodered/addons.yml
@@ -8,7 +8,6 @@ addons:
     - "node-red-node-pi-gpiod"
     - "node-red-contrib-influxdb"
     - "node-red-contrib-boolean-logic"
-    - "node-red-node-rbe"
     - "node-red-configurable-ping"
     - "node-red-dashboard"
   default_off:
@@ -48,8 +47,13 @@ addons:
     - "node-red-contrib-generic-ble"
     - "node-red-contrib-zigbee2mqtt"
     - "node-red-contrib-vcgencmd"
-    - "node-red-contrib-themes/midnight-red"
+    - "@node-red-contrib-themes/theme-collection"
     - "node-red-contrib-tf-function"
     - "node-red-contrib-tf-model"
     - "node-red-contrib-post-object-detection"
-    - "node-red-contrib-bert-tokenizer"
\ No newline at end of file
+    - "node-red-contrib-bert-tokenizer"
+    - "node-red-node-tail"
+    - "node-red-contrib-boolean-logic-ultimate"
+    - "node-red-contrib-chartjs"
+    - "node-red-contrib-md5"
+    - "node-red-contrib-pushsafer"