Bring latest updates into master - add openssl, fix healthcheck (#162)

* Added support for s390x

* Added support for s390x - manifest list added

* bump node-red 1.0.1

* add s390x to Readme [skip travis]

* Update README.md [skip travis]

* Feature development repo (#149)


* updated as discussed in PR144

* updated as discussed in PR144 #1

* updated as discussed in PR149 #1

* updated as discussed in PR149 #2

* Add healthcheck to dev

* Feature/i386 (#153)

* added i386 support

* fix manifest arch for 386

* - added `dev` manifest list tag
- fix contains "beta" | "dev"

* - if condition fix

* Fixup dev branch custom package.json to 1.0.2

merge changes from master to README.

* - missing i386 added

* let healthcheck be more tolerant

only fail if not running rather than if ok but no page in case someone moves everything from /

* - [skip travis] added Dockerhub Stars

* - [skip travis] textual

* - fix: set Docker Repo

* Add openSSL (#157)


* Add openSSL

* add openssl to custom image, correct readme to say ssh rather  than ssl (skip travis)

* Update README.md

* Squashed commit of the following:

commit 4e11a11
Author: Nick O'Leary <[email protected]>
Date:   Wed Dec 18 20:28:18 2019 +0000

    Remove healthcheck as it does not handle https
    Fixes #159

commit 2dad455
Author: Nick O'Leary <[email protected]>
Date:   Thu Nov 21 20:21:56 2019 +0000

    Update for 1.0.3

commit 1ffd9e7
Author: Raymond Mouthaan <[email protected]>
Date:   Mon Oct 21 20:53:03 2019 +0200

    Support i386 (#155)

    * Added support for s390x

    * Added support for s390x - manifest list added

    * bump node-red 1.0.1

    * add s390x to Readme [skip travis]

    * Update README.md [skip travis]

    * Feature development repo (#149)

    * updated as discussed in PR144

    * updated as discussed in PR144 #1

    * updated as discussed in PR149 #1

    * updated as discussed in PR149 #2

    * Add healthcheck to dev

    * Feature/i386 (#153)

    * added i386 support

    * fix manifest arch for 386

    * Fixup dev branch custom package.json to 1.0.2

    merge changes from master to README.

    * - missing i386 added

    * let healthcheck be more tolerant

    * - [skip travis] added Dockerhub Stars

* new dual use healthcheck test

* Fix healthcheck to read settings.js

* Update healthcheck.js

* Update README.md

Co-authored-by: Raymond Mouthaan <[email protected]>
Co-authored-by: Chris G <[email protected]>

Author: 3 people

.docker/Dockerfile.alpine

@@ -11,6 +11,7 @@ COPY tmp/qemu-$QEMU_ARCH-static /usr/bin/qemu-$QEMU_ARCH-static
 
 # Copy scripts
 COPY .docker/scripts/*.sh /tmp/
+COPY .docker/healthcheck.js /
 
 # Install tools, create Node-RED app and data dir, add user and set rights
 RUN set -ex && \
@@ -21,6 +22,7 @@ RUN set -ex && \
         curl \
         nano \
         git \
+        openssl \
         openssh-client && \
     mkdir -p /usr/src/node-red /data && \
     deluser --remove-home node && \
@@ -90,4 +92,7 @@ VOLUME ["/data"]
 # Expose the listening port of node-red
 EXPOSE 1880
 
+# Add a healthcheck (default every 30 secs)
+HEALTHCHECK CMD node /healthcheck.js
+
 ENTRYPOINT ["npm", "start", "--", "--userDir", "/data"]

.docker/healthcheck.js

@@ -0,0 +1,32 @@
+var http = require('http');
+var https = require('https');
+var settings = require('/data/settings.js');
+var request;
+
+var options = {
+    host : "localhost",
+    port : settings.uiPort || 1880,
+    timeout : 4000
+};
+
+if (settings.hasOwnProperty("https")) {
+    request = https.request(options, (res) => {
+        //console.log(`STATUS: ${res.statusCode}`);
+        if (res.statusCode == 200) { process.exit(0); }
+        else { process.exit(1); }
+    });
+}
+else {
+    request = http.request(options, (res) => {
+        //console.log(`STATUS: ${res.statusCode}`);
+        if (res.statusCode == 200) { process.exit(0); }
+        else { process.exit(1); }
+    });
+}
+
+request.on('error', function(err) {
+    //console.log('ERROR',err);
+    process.exit(1);
+});
+
+request.end(); 

README.md

@@ -140,7 +140,7 @@ The following table shows the variety of provided Node-RED images.
 | 1.0.3-12-minimal-s390x     |   12   | s390x    |     no     |  no   | s390x/node:12-alpine   |
 | 1.0.3-12-minimal-i386      |   12   | i386     |     no     |  no   | i386/node:12-alpine    |
 
-- All images have bash, tzdata, nano, curl git and openssl tools pre-installed to support Node-RED's Projects feature.
+- All images have bash, tzdata, nano, curl, git, openssl and openssh-client pre-installed to support Node-RED's Projects feature.
 
 ## Manifest Lists
 The following table shows the provided Manifest Lists.

docker-custom/Dockerfile.custom

@@ -17,6 +17,7 @@ RUN set -ex && \
         curl \
         nano \
         git \
+        openssl \
         openssh-client && \
     mkdir -p /usr/src/node-red /data && \
     deluser --remove-home node && \
@@ -84,4 +85,7 @@ VOLUME ["/data"]
 # Expose the listening port of node-red
 EXPOSE 1880
 
+# Add a healthcheck (default every 30 secs)
+# HEALTHCHECK CMD curl http://localhost:1880/ || exit 1
+
 ENTRYPOINT ["npm", "start", "--", "--userDir", "/data"]