Skip to content

Commit

Permalink
2024-07-30 Node-RED - master branch - PR 1 of 2
Browse files Browse the repository at this point in the history
Harmonises list of add-on nodes across old-menu and master branches.
I've tried to stay away from SensorsIot#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]>
  • Loading branch information
Paraphraser committed Jul 30, 2024
1 parent b1d67ed commit a05bc39
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 1 addition & 5 deletions .templates/nodered/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -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%
10 changes: 7 additions & 3 deletions .templates/nodered/addons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
- "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"

0 comments on commit a05bc39

Please sign in to comment.