update docker manager

jsreport.config.json

@@ -9,6 +9,7 @@
     },
     "templatingEngines": {
         "strategy": "in-process",
+        "allowedModules": "lodash,handlebars",
         "timeout": 10000
     },
     "chrome": {
@@ -72,7 +73,8 @@
             "enabled": false
         },
         "scripts": {
-            "timeout": 30000
+            "timeout": 30000,
+            "allowedModules": "http,https,lodash,bluebird,async,axios,request"
         },
         "scheduling": {
             "enabled": false

package.json

@@ -25,7 +25,9 @@
     "client-sessions": "0.8.0",
     "connect-ensure-login": "0.1.1",
     "eslint-config-standard-react": "7.0.2",
+    "ip": "1.1.5",
     "jsreport": "2.2.0",
+    "jsreport-core": "2.2.0",
     "jsreport-ejs": "2.0.0",
     "jsreport-electron-pdf": "3.0.0",
     "jsreport-fop-pdf": "2.0.0",
@@ -36,7 +38,7 @@
     "jsreport-studio": "2.1.1",
     "jsreport-version-control": "1.0.6",
     "jsreport-wkhtmltopdf": "2.0.3",
-    "jsreport-worker-docker-manager": "1.0.6",
+    "jsreport-worker-docker-manager": "1.0.7",
     "jsreport-xlsx": "2.0.1",
     "lodash.debounce": "4.0.8",
     "nanoid": "1.2.2",

server.js

@@ -1,6 +1,15 @@
 const winston = require('winston')
 require('winston-loggly')
 
+// just temporary hack until we release full jsreport
+require('rimraf').sync('node_modules/jsreport/node_modules/jsreport-core')
+
+if (!process.env.ip && !process.env.stack) {
+  console.log('Using local ip address and localdev stack')
+  process.env.ip = require('ip').address()
+  process.env.stack = 'localdev'
+}
+
 process.env.extensions_workerDockerManager_discriminatorPath = 'context.clientIp'
 
 if (process.env.NODE_ENV === 'jsreport-development') {