@flowfuse/driver-docker 2.0.0 → 2.2.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+#### 2.2.0: Release
+
+ - Pull missing Stack containers on first use (#85) @hardillb
+ - Change default stack container (#84) @hardillb
+
+#### 2.1.0: Release
+
+ - Add log passthrough support (#82) @hardillb
+
 #### 2.0.0: Release
 
 

package/README.md

@@ -14,11 +14,13 @@ driver:
     socket: /var/run/docker.sock
     registry: containers.flowforge.com
     privateCA: /full/path/to/chain.pem
+    logPassthrough: true
 ```
 
  - `registry` is the Docker Registry to load Stack Containers from (default: Docker Hub)
  - `socket` is the path to the docker unix domain socket (default: /var/run/docker.sock)
- - privateCA: is the fully qualified path to a pem file containing trusted CA cert chain (default: not set)
+ - `privateCA`: is the fully qualified path to a pem file containing trusted CA cert chain (default: not set)
+ - `logPassthrough` Have Node-RED logs printed in JSON format to container stdout (default: false)
 
 ### Configuration via environment variables
 

package/docker.js

@@ -86,13 +86,51 @@ const createContainer = async (project, domain) => {
         contOptions.Env.push(`FORGE_NR_SECRET=${credentialSecret}`)
     }
 
-    if (this._app.config.driver.options.privateCA && fs.existsSync(this._app.config.driver.options.privateCA)) {
+    if (this._options?.logPassthrough) {
+        contOptions.Env.push('FORGE_LOG_PASSTHROUGH=true')
+    }
+
+    if (this._app.config.driver.options?.privateCA && fs.existsSync(this._app.config.driver.options?.privateCA)) {
         contOptions.Binds = [
             `${this._app.config.driver.options.privateCA}:/usr/local/ssl-certs/chain.pem`
         ]
         contOptions.Env.push('NODE_EXTRA_CA_CERTS=/usr/local/ssl-certs/chain.pem')
     }
 
+    const containerList = await this._docker.listImages()
+    let containerFound = false
+    for (const cont of containerList) {
+        if (cont.RepoTags.includes(stack.container)) {
+            containerFound = true
+            break
+        }
+    }
+
+    if (!containerFound) {
+        this._app.log.info(`Container for stack ${stack.name} not found, pulling ${stack.container}`)
+        // https://github.com/apocas/dockerode/issues/703
+        try {
+            await new Promise((resolve, reject) => {
+                this._docker.pull(stack.container, (err, stream) => {
+                    if (!err) {
+                        this._docker.modem.followProgress(stream, onFinished)
+                        function onFinished (err, output) {
+                            if (!err) {
+                                resolve(true)
+                                return
+                            }
+                            reject(err)
+                        }
+                    } else {
+                        reject(err)
+                    }
+                })
+            })
+        } catch (err) {
+            this._app.log.debug(`Error pulling image ${stack.container} ${err.message}`)
+        }
+    }
+
     const container = await this._docker.createContainer(contOptions)
     return container.start()
         .then(async () => {
@@ -437,7 +475,7 @@ module.exports = {
         const properties = {
             cpu: 10,
             memory: 256,
-            container: 'flowforge/node-red',
+            container: 'flowfuse/node-red',
             ...this._app.config.driver.options?.default_stack
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/driver-docker",
-    "version": "2.0.0",
+    "version": "2.2.0",
     "description": "Docker driver for FlowFuse",
     "main": "docker.js",
     "scripts": {