Skip to content

Commit e18550a

Browse files
hardillbknollearytakuya-o
authored
Merge master into dev (#406)
* Update package.json * Update package.json * Bump package to 3.1.0 * Fix naming of debian stable version tag (#387) * Ensure respin builds get pushed to docker hub (#388) there was an extra line that reset the TRAVIS_TAG var that needed removing * Disable linux/390x for now (#394) * Bump for 3.1.1 release (#396) * Bump to 3.1.2 * Bump to 3.1.3 * 📝Fix Docker image tag and Node version mismatch in README.md (#401) The Docker image tag in README.md was not correctly set to the version of Node being used. This commit fixes the mismatch by updating the Docker image tag to the correct version. * Update healthcheck.js (#405) Ensure it checks IPv4 localhost --------- Co-authored-by: Nick O'Leary <nick.oleary@gmail.com> Co-authored-by: knolleary <knolleary@users.noreply.github.com> Co-authored-by: Takuya Ono <takuya-o@users.osdn.me>
1 parent 89d5977 commit e18550a

5 files changed

Lines changed: 37 additions & 40 deletions

File tree

‎.docker/healthcheck.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var request;
66
process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
77

88
var options = {
9-
host : "localhost",
9+
host : "127.0.0.1",
1010
port : settings.uiPort || 1880,
1111
timeout : 4000
1212
};
@@ -31,4 +31,4 @@ request.on('error', function(err) {
3131
process.exit(1);
3232
});
3333

34-
request.end();
34+
request.end();

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ jobs:
9090
9191
echo "TRAVIS_TAG = $TRAVIS_TAG"
9292
93-
TRAVIS_TAG=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
9493
if [[ "$TRAVIS_TAG" =~ ^v[0-9\.-]*$ ]]; then
9594
IMAGE=${{ env.DEFAULT_IMAGE }}
9695
PUSH=true
@@ -144,7 +143,7 @@ jobs:
144143
continue-on-error: true
145144
with:
146145
context: .
147-
platforms: linux/amd64, linux/arm64, linux/s390x, linux/arm/v7, linux/arm/v6
146+
platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6
148147
push: ${{ steps.nrVersion.outputs.push }}
149148
file: .docker/Dockerfile.alpine
150149
build-args: |
@@ -212,7 +211,7 @@ jobs:
212211
VERSION=${TRAVIS_TAG:1}
213212
STABLE_VERSION=`echo ${VERSION} | sed -r 's/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$/\1.\2/'`
214213
215-
TAGS="$IMAGE:latest-debian,$IMAGE:$VERSION-debian,$IMAGE:STABLE_VERSION-debian"
214+
TAGS="$IMAGE:latest-debian,$IMAGE:$VERSION-debian,$IMAGE:$STABLE_VERSION-debian"
216215
217216
else
218217
IMAGE=${{ env.DEV_IMAGE }}

‎README.md‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ Let's dissect that command:
2626
-p 1880:1880 - connect local port 1880 to the exposed internal port 1880
2727
-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
2828
--name mynodered - give this machine a friendly local name
29-
nodered/node-red - the image to base it on - currently Node-RED v3.0.2
29+
nodered/node-red - the image to base it on - currently Node-RED v3.1.3
3030

3131

3232
Running that command should give a terminal window with a running instance of Node-RED.
3333

3434
Welcome to Node-RED
3535
===================
3636

37-
10 Oct 12:57:10 - [info] Node-RED version: v3.0.2
37+
10 Oct 12:57:10 - [info] Node-RED version: v3.1.3
3838
10 Oct 12:57:10 - [info] Node.js version: v16.14.1
3939
10 Oct 12:57:10 - [info] Linux 4.19.76-linuxkit x64 LE
4040
10 Oct 12:57:11 - [info] Loading palette nodes
@@ -114,14 +114,14 @@ The following table shows the variety of provided Node-RED images.
114114

115115
| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** |
116116
|----------------------------|--------|----------|------------|-------|----------------------------|
117-
| 3.0.2-14 | 14 | amd64 | 2.x 3.x | yes | amd64/node:14-alpine |
117+
| 3.1.3-14 | 14 | amd64 | 2.x 3.x | yes | amd64/node:14-alpine |
118118
| | 14 | arm32v6 | 2.x 3.x | yes | arm32v6/node:14-alpine |
119119
| | 14 | arm32v7 | 2.x 3.x | yes | arm32v7/node:14-alpine |
120120
| | 14 | arm64v8 | 2.x 3.x | yes | arm64v8/node:14-alpine |
121121
| | 14 | s390x | 2.x 3.x | yes | s390x/node:14-alpine |
122122
| | 14 | i386 | 2.x 3.x | yes | i386/node:14-alpine |
123123
| | | | | | |
124-
| 3.0.2-14-minimal | 14 | amd64 | no | no | amd64/node:14-alpine |
124+
| 3.1.3-14-minimal | 14 | amd64 | no | no | amd64/node:14-alpine |
125125
| | 14 | arm32v6 | no | no | arm32v6/node:14-alpine |
126126
| | 14 | arm32v7 | no | no | arm32v7/node:14-alpine |
127127
| | 14 | arm64v8 | no | no | arm64v8/node:14-alpine |
@@ -130,30 +130,30 @@ The following table shows the variety of provided Node-RED images.
130130

131131
| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** |
132132
|----------------------------|--------|----------|------------|-------|----------------------------|
133-
| 3.0.2-16 | 14 | amd64 | 2.x 3.x | yes | amd64/node:16-alpine |
134-
| | 14 | arm32v6 | 2.x 3.x | yes | arm32v6/node:16-alpine |
135-
| | 14 | arm32v7 | 2.x 3.x | yes | arm32v7/node:16-alpine |
136-
| | 14 | arm64v8 | 2.x 3.x | yes | arm64v8/node:16-alpine |
137-
| | 14 | s390x | 2.x 3.x | yes | s390x/node:16-alpine |
138-
| | 14 | i386 | 2.x 3.x | yes | i386/node:16-alpine |
133+
| 3.1.3-16 | 16 | amd64 | 2.x 3.x | yes | amd64/node:16-alpine |
134+
| | 16 | arm32v6 | 2.x 3.x | yes | arm32v6/node:16-alpine |
135+
| | 16 | arm32v7 | 2.x 3.x | yes | arm32v7/node:16-alpine |
136+
| | 16 | arm64v8 | 2.x 3.x | yes | arm64v8/node:16-alpine |
137+
| | 16 | s390x | 2.x 3.x | yes | s390x/node:16-alpine |
138+
| | 16 | i386 | 2.x 3.x | yes | i386/node:16-alpine |
139139
| | | | | | |
140-
| 3.0.2-16-minimal | 14 | amd64 | no | no | amd64/node:14-alpine |
141-
| | 14 | arm32v6 | no | no | arm32v6/node:14-alpine |
142-
| | 14 | arm32v7 | no | no | arm32v7/node:14-alpine |
143-
| | 14 | arm64v8 | no | no | arm64v8/node:14-alpine |
144-
| | 14 | s390x | no | no | s390x/node:14-alpine |
145-
| | 14 | i386 | no | no | i386/node:14-alpine |
140+
| 3.1.3-16-minimal | 16 | amd64 | no | no | amd64/node:16-alpine |
141+
| | 16 | arm32v6 | no | no | arm32v6/node:16-alpine |
142+
| | 16 | arm32v7 | no | no | arm32v7/node:16-alpine |
143+
| | 16 | arm64v8 | no | no | arm64v8/node:16-alpine |
144+
| | 16 | s390x | no | no | s390x/node:16-alpine |
145+
| | 16 | i386 | no | no | i386/node:16-alpine |
146146

147147
| **Tag** |**Node**| **Arch** | **Python** |**Dev**| **Base Image** |
148148
|----------------------------|--------|----------|------------|-------|----------------------------|
149-
| 3.0.2-18 | 18 | amd64 | 2.x 3.x | yes | amd64/node:18-alpine |
149+
| 3.1.3-18 | 18 | amd64 | 2.x 3.x | yes | amd64/node:18-alpine |
150150
| | 18 | arm32v6 | 2.x 3.x | yes | arm32v6/node:18-alpine |
151151
| | 18 | arm32v7 | 2.x 3.x | yes | arm32v7/node:18-alpine |
152152
| | 18 | arm64v8 | 2.x 3.x | yes | arm64v8/node:18-alpine |
153153
| | 18 | s390x | 2.x 3.x | yes | s390x/node:18-alpine |
154154
| | 18 | i386 | 2.x 3.x | yes | i386/node:18-alpine |
155155
| | | | | | |
156-
| 3.0.2-18-minimal | 18 | amd64 | no | no | amd64/node:18-alpine |
156+
| 3.1.3-18-minimal | 18 | amd64 | no | no | amd64/node:18-alpine |
157157
| | 18 | arm32v6 | no | no | arm32v6/node:18-alpine |
158158
| | 18 | arm32v7 | no | no | arm32v7/node:18-alpine |
159159
| | 18 | arm64v8 | no | no | arm64v8/node:18-alpine |
@@ -167,39 +167,39 @@ The following table shows the provided Manifest Lists.
167167

168168
| **Tag** | **Node-RED Base Image** |
169169
|----------------------------------------|--------------------------------------------|
170-
| latest, 3.0.2, | nodered/node-red:3.0.2-16 |
171-
| latest-16, 3.0.2-16 | |
170+
| latest, 3.1.3, | nodered/node-red:3.1.3-16 |
171+
| latest-16, 3.1.3-16 | |
172172
| | |
173173
| | |
174-
| latest-minimal, 3.0.2-minimal, | nodered/node-red:3.0.2-16-minimal |
175-
| latest-16-minimal, 3.0.2-16-minimal | |
174+
| latest-minimal, 3.1.3-minimal, | nodered/node-red:3.1.3-16-minimal |
175+
| latest-16-minimal, 3.1.3-16-minimal | |
176176

177177

178178
| **Tag** | **Node-RED Base Image** |
179179
|----------------------------------------|--------------------------------------------|
180-
| latest-14, 3.0.2-14 | nodered/node-red:3.0.2-12 |
180+
| latest-14, 3.1.3-14 | nodered/node-red:3.1.3-14 |
181181
| | |
182-
| latest-14-minimal, 3.0.2-14-minimal | nodered/node-red:3.0.2-12-minimal |
182+
| latest-14-minimal, 3.1.3-14-minimal | nodered/node-red:3.1.3-14-minimal |
183183

184184
| **Tag** | **Node-RED Base Image** |
185185
|----------------------------------------|--------------------------------------------|
186-
| latest-18, 3.0.2-18 | nodered/node-red:3.0.2-18 |
186+
| latest-18, 3.1.3-18 | nodered/node-red:3.1.3-18 |
187187
| | |
188-
| latest-18-minimal, 3.0.2-18-minimal | nodered/node-red:3.0.2-18-minimal
188+
| latest-18-minimal, 3.1.3-18-minimal | nodered/node-red:3.1.3-18-minimal
189189

190190

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

194194
Therefore all tags regarding Raspberry PI's are dropped.
195195

196-
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.2-16`), and run the container.
196+
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.1.3-16`), and run the container.
197197

198198
```
199199
docker run -it -p 1880:1880 -v node_red_data:/data --name mynodered nodered/node-red:latest
200200
```
201201

202-
The same command can be used for running on an amd64 system, since docker discovers its running on a amd64 host and pulls the image with the matching tag (`3.0.2-16-amd64`).
202+
The same command can be used for running on an amd64 system, since docker discovers its running on a amd64 host and pulls the image with the matching tag (`3.1.3-16-amd64`).
203203

204204
This gives the advantage that you don't need to know/specify which architecture you are running on and makes docker run commands and docker compose files more flexible and exchangeable across systems.
205205

@@ -334,7 +334,7 @@ Docker build process, the dependencies are installed under `/usr/src/node-red`.
334334
The main sections to modify are
335335

336336
"dependencies": {
337-
"node-red": "^3.0.2", <-- set the version of Node-RED here
337+
"node-red": "^3.1.3", <-- set the version of Node-RED here
338338
"node-red-dashboard": "*" <-- add any extra npm packages here
339339
},
340340

‎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": "3.0.2",
3+
"version": "3.1.3",
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": "3.0.2"
32+
"node-red": "3.1.3"
3333
},
3434
"engines": {
3535
"node": ">=14"

‎package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "node-red-docker",
3-
"version": "3.1.0-beta.4",
4-
"version": "3.0.2",
3+
"version": "3.1.3",
54
"description": "Low-code programming for event-driven applications",
65
"homepage": "http://nodered.org",
76
"license": "Apache-2.0",
@@ -30,8 +29,7 @@
3029
}
3130
],
3231
"dependencies": {
33-
"node-red": "3.1.0-beta.4"
34-
"node-red": "3.0.2"
32+
"node-red": "3.1.3"
3533
},
3634
"engines": {
3735
"node": ">=14"

0 commit comments

Comments
 (0)