Skip to content

Commit 8784843

Browse files
hardillbknolleary
hardillb
and
knolleary
authored
Sync master back to dev (#491)
* Add iputils-ping to the base packages * Bump to 4.1.0 * Fix version test * Fix Version test (#489) * Add iputils-ping to the base packages * Fix version test * Fix debian python * Fix Python on Debian build (#490) * Add iputils-ping to the base packages * Fix version test * Fix debian python --------- Co-authored-by: Nick O'Leary <[email protected]> Co-authored-by: knolleary <[email protected]>
1 parent 4b3427b commit 8784843

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

‎.docker/Dockerfile.debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ COPY .docker/scripts/entrypoint.sh .
4747
FROM base AS build
4848

4949
# Install Build tools
50-
RUN apt-get update && apt-get install -y build-essential python && \
50+
RUN apt-get update && apt-get install -y build-essential python3 python-is-python3 && \
5151
npm install --unsafe-perm --no-update-notifier --no-fund --only=production && \
5252
npm uninstall node-red-node-gpio && \
5353
cp -R node_modules prod_node_modules
@@ -79,7 +79,7 @@ COPY --from=build /usr/src/node-red/prod_node_modules ./node_modules
7979

8080
# Chown, install devtools & Clean up
8181
RUN chown -R node-red:root /usr/src/node-red && \
82-
apt-get update && apt-get install -y build-essential python-dev python3 && \
82+
apt-get update && apt-get install -y build-essential python3-dev python3 && \
8383
rm -r /tmp/*
8484

8585
RUN npm config set cache /data/.npm --global

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
fi
145145
146146
VERSION=${TRAVIS_TAG}
147-
if [[ "$VERSION" ~= ^v ]]; then
147+
if [[ "$VERSION" =~ ^v ]]; then
148148
VERSION=${TRAVIS_TAG:1}
149149
fi
150150
@@ -300,7 +300,7 @@ jobs:
300300
fi
301301
302302
VERSION=${TRAVIS_TAG}
303-
if [[ "$VERSION" ~= ^v ]]; then
303+
if [[ "$VERSION" =~ ^v ]]; then
304304
VERSION=${TRAVIS_TAG:1}
305305
fi
306306

‎README.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Let's dissect that command:
2828
-p 1880:1880 - connect local port 1880 to the exposed internal port 1880
2929
-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
3030
--name mynodered - give this machine a friendly local name
31-
nodered/node-red - the image to base it on - currently Node-RED v4.1.0-beta.2
31+
nodered/node-red - the image to base it on - currently Node-RED v4.1.0
3232

3333

3434

@@ -37,7 +37,7 @@ Running that command should give a terminal window with a running instance of No
3737
Welcome to Node-RED
3838
===================
3939

40-
10 Oct 12:57:10 - [info] Node-RED version: v4.1.0-beta.2
40+
10 Oct 12:57:10 - [info] Node-RED version: v4.1.0
4141
10 Oct 12:57:10 - [info] Node.js version: v18.19.0
4242
10 Oct 12:57:10 - [info] Linux 6.6.13-100.fc38.x86_64 x64 LE
4343
10 Oct 12:57:11 - [info] Loading palette nodes
@@ -116,40 +116,40 @@ The following table shows the variety of provided Node-RED images.
116116

117117
| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** |
118118
|----------------------------|--------|----------|------------|-------|----------------------------|
119-
| 4.1.0-beta.2-18 | 18 | amd64 | 3.x | yes | amd64/node:18-alpine |
119+
| 4.1.0-18 | 18 | amd64 | 3.x | yes | amd64/node:18-alpine |
120120
| | 18 | arm32v7 | 3.x | yes | arm32v7/node:18-alpine |
121121
| | 18 | arm64v8 | 3.x | yes | arm64v8/node:18-alpine |
122122
| | 18 | i386 | 3.x | yes | i386/node:18-alpine |
123123
| | | | | | |
124-
| 4.1.0-beta.2-18-minimal | 18 | amd64 | no | no | amd64/node:18-alpine |
124+
| 4.1.0-18-minimal | 18 | amd64 | no | no | amd64/node:18-alpine |
125125
| | 18 | arm32v7 | no | no | arm32v7/node:18-alpine |
126126
| | 18 | arm64v8 | no | no | arm64v8/node:18-alpine |
127127
| | 18 | i386 | no | no | i386/node:18-alpine |
128128

129129
| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** |
130130
|----------------------------|--------|----------|------------|-------|----------------------------|
131-
| 4.1.0-beta.2-20 | 20 | amd64 | 3.x | yes | amd64/node:20-alpine |
131+
| 4.1.0-20 | 20 | amd64 | 3.x | yes | amd64/node:20-alpine |
132132
| | 20 | arm32v7 | 3.x | yes | arm32v7/node:20-alpine |
133133
| | 20 | arm64v8 | 3.x | yes | arm64v8/node:20-alpine |
134134
| | 20 | i386 | 3.x | yes | i386/node:20-alpine |
135135
| | | | | | |
136-
| 4.1.0-beta.2-20-minimal | 20 | amd64 | no | no | amd64/node:20-alpine |
136+
| 4.1.0-20-minimal | 20 | amd64 | no | no | amd64/node:20-alpine |
137137
| | 20 | arm32v7 | no | no | arm32v7/node:20-alpine |
138138
| | 20 | arm64v8 | no | no | arm64v8/node:20-alpine |
139139
| | 20 | i386 | no | no | i386/node:20-alpine |
140140
| | | | | | |
141-
| 4.1.0-beta.2-debian | 20 | amd64 | 3.x | yes | amd64/node:20-buster-slim |
141+
| 4.1.0-debian | 20 | amd64 | 3.x | yes | amd64/node:20-buster-slim |
142142
| | 20 | arm32v7 | 3.x | yes | amd64/node:20-buster-slim |
143143
| | 20 | arm64v8 | 3.x | yes | amd64/node:20-buster-slim |
144144

145145
| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** |
146146
|----------------------------|--------|----------|------------|-------|----------------------------|
147-
| 4.1.0-beta.2-22 | 22 | amd64 | 3.x | yes | amd64/node:22-alpine |
147+
| 4.1.0-22 | 22 | amd64 | 3.x | yes | amd64/node:22-alpine |
148148
| | 22 | arm32v7 | 3.x | yes | arm32v7/node:22-alpine |
149149
| | 22 | arm64v8 | 3.x | yes | arm64v8/node:22-alpine |
150150
| | 22 | i386 | 3.x | yes | i386/node:22-alpine |
151151
| | | | | | |
152-
| 4.1.0-beta.2-22-minimal | 22 | amd64 | no | no | amd64/node:22-alpine |
152+
| 4.1.0-22-minimal | 22 | amd64 | no | no | amd64/node:22-alpine |
153153
| | 22 | arm32v7 | no | no | arm32v7/node:22-alpine |
154154
| | 22 | arm64v8 | no | no | arm64v8/node:22-alpine |
155155
| | 22 | i386 | no | no | i386/node:22-alpine |
@@ -161,36 +161,36 @@ The following table shows the provided Manifest Lists.
161161

162162
| **Tag** | **Node-RED Base Image** |
163163
|----------------------------------------|--------------------------------------------|
164-
| latest, 4.1.0-beta.2, | nodered/node-red:4.1.0-beta.2-20 |
165-
| latest-20, 4.1.0-beta.2-20 | |
164+
| latest, 4.1.0, | nodered/node-red:4.1.0-20 |
165+
| latest-20, 4.1.0-20 | |
166166
| | |
167167
| | |
168-
| latest-minimal, 4.1.0-beta.2-minimal, | nodered/node-red:4.1.0-beta.2-20-minimal |
169-
| latest-20-minimal, 4.1.0-beta.2-20-minimal | |
168+
| latest-minimal, 4.1.0-minimal, | nodered/node-red:4.1.0-20-minimal |
169+
| latest-20-minimal, 4.1.0-20-minimal | |
170170
| | |
171171
| latest-debian | nodered/node-red:latest-debian |
172172

173173

174174
| **Tag** | **Node-RED Base Image** |
175175
|----------------------------------------|--------------------------------------------|
176-
| latest-18, 4.1.0-beta.2-18 | nodered/node-red:4.1.0-beta.2-18 |
176+
| latest-18, 4.1.0-18 | nodered/node-red:4.1.0-18 |
177177
| | |
178-
| latest-18-minimal, 4.1.0-beta.2-18-minimal | nodered/node-red:4.1.0-beta.2-18-minimal |
178+
| latest-18-minimal, 4.1.0-18-minimal | nodered/node-red:4.1.0-18-minimal |
179179

180180

181181
| **Tag** | **Node-RED Base Image** |
182182
|----------------------------------------|--------------------------------------------|
183-
| latest-22, 4.1.0-beta.2-22 | nodered/node-red:4.1.0-beta.2-22 |
183+
| latest-22, 4.1.0-22 | nodered/node-red:4.1.0-22 |
184184
| | |
185-
| latest-22-minimal, 4.1.0-beta.2-22-minimal | nodered/node-red:4.1.0-beta.2-22-minimal
185+
| latest-22-minimal, 4.1.0-22-minimal | nodered/node-red:4.1.0-22-minimal
186186

187187

188188
With the support of Docker manifest list, there is no need to explicitly add the tag for the architecture to use.
189189
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.
190190

191191
Therefore all tags regarding Raspberry PI's are dropped.
192192

193-
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 `4.1.0-beta.2-20`), and run the container.
193+
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 `4.1.0-20`), and run the container.
194194

195195

196196
```
@@ -330,7 +330,7 @@ Docker build process, the dependencies are installed under `/usr/src/node-red`.
330330
The main sections to modify are
331331

332332
"dependencies": {
333-
"node-red": "^4.1.0-beta.2", <-- set the version of Node-RED here
333+
"node-red": "^4.1.0", <-- set the version of Node-RED here
334334
"node-red-dashboard": "*" <-- add any extra npm packages here
335335
},
336336

‎docker-custom/Dockerfile.debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ COPY scripts/entrypoint.sh .
4848
FROM base AS build
4949

5050
# Install Build tools
51-
RUN apt-get update && apt-get install -y build-essential python && \
51+
RUN apt-get update && apt-get install -y build-essential python3 python-is-python3 && \
5252
npm install --unsafe-perm --no-update-notifier --no-fund --only=production && \
5353
npm uninstall node-red-node-gpio && \
5454
cp -R node_modules prod_node_modules
@@ -80,7 +80,7 @@ COPY --from=build /usr/src/node-red/prod_node_modules ./node_modules
8080

8181
# Chown, install devtools & Clean up
8282
RUN chown -R node-red:root /usr/src/node-red && \
83-
apt-get update && apt-get install -y build-essential python-dev python3 && \
83+
apt-get update && apt-get install -y build-essential python3-dev python3 && \
8484
rm -r /tmp/*
8585

8686
RUN npm config set cache /data/.npm --global

‎docker-custom/docker-debian.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ docker build --rm --no-cache \
99
--build-arg ARCH=amd64 \
1010
--build-arg NODE_VERSION=20 \
1111
--build-arg NODE_RED_VERSION=${NODE_RED_VERSION} \
12-
--build-arg OS=bullseye-slim \
12+
--build-arg OS=bookworm-slim \
1313
--build-arg BUILD_DATE="$(date +"%Y-%m-%dT%H:%M:%SZ")" \
1414
--build-arg TAG_SUFFIX=default \
1515
--file Dockerfile.debian \

‎docker-custom/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-red-docker",
3-
"version": "4.1.0-beta.2",
3+
"version": "4.1.0",
44
"description": "Low-code programming for event-driven applications",
55
"homepage": "http://nodered.org",
66
"license": "Apache-2.0",
@@ -29,7 +29,7 @@
2929
}
3030
],
3131
"dependencies": {
32-
"node-red": "4.1.0-beta.2"
32+
"node-red": "4.1.0"
3333
},
3434
"engines": {
3535
"node": ">=18"

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-red-docker",
3-
"version": "4.1.0-beta.2",
3+
"version": "4.1.0",
44
"description": "Low-code programming for event-driven applications",
55
"homepage": "http://nodered.org",
66
"license": "Apache-2.0",
@@ -29,7 +29,7 @@
2929
}
3030
],
3131
"dependencies": {
32-
"node-red": "4.1.0-beta.2"
32+
"node-red": "4.1.0"
3333
},
3434
"engines": {
3535
"node": ">=18"

0 commit comments

Comments
 (0)