Skip to content

Commit a05bc39

Browse files
committed
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](node-red/node-red-docker#338). Signed-off-by: Phill Kelley <[email protected]>
1 parent b1d67ed commit a05bc39

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Diff for: .templates/nodered/Dockerfile.template

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@ FROM nodered/node-red:${DOCKERHUB_TAG}
66

77
# reference argument - omitted defaults to null
88
ARG EXTRA_PACKAGES
9-
ENV EXTRA_PACKAGES=${EXTRA_PACKAGES}
109

1110
# default user is node-red - need to be root to install packages
1211
USER root
1312

1413
# install packages
15-
RUN apk update && apk add --no-cache eudev-dev ${EXTRA_PACKAGES}
14+
RUN apk add --no-cache eudev-dev ${EXTRA_PACKAGES}
1615

1716
# switch back to default user
1817
USER node-red
1918

20-
# variable not needed inside running container
21-
ENV EXTRA_PACKAGES=
22-
2319
# add-on nodes follow
2420

2521
%run npm install modules list%

Diff for: .templates/nodered/addons.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ addons:
88
- "node-red-node-pi-gpiod"
99
- "node-red-contrib-influxdb"
1010
- "node-red-contrib-boolean-logic"
11-
- "node-red-node-rbe"
1211
- "node-red-configurable-ping"
1312
- "node-red-dashboard"
1413
default_off:
@@ -48,8 +47,13 @@ addons:
4847
- "node-red-contrib-generic-ble"
4948
- "node-red-contrib-zigbee2mqtt"
5049
- "node-red-contrib-vcgencmd"
51-
- "node-red-contrib-themes/midnight-red"
50+
- "@node-red-contrib-themes/theme-collection"
5251
- "node-red-contrib-tf-function"
5352
- "node-red-contrib-tf-model"
5453
- "node-red-contrib-post-object-detection"
55-
- "node-red-contrib-bert-tokenizer"
54+
- "node-red-contrib-bert-tokenizer"
55+
- "node-red-node-tail"
56+
- "node-red-contrib-boolean-logic-ultimate"
57+
- "node-red-contrib-chartjs"
58+
- "node-red-contrib-md5"
59+
- "node-red-contrib-pushsafer"

0 commit comments

Comments
 (0)