Wui

.internal/api/src/utils/commonBuildChecks.js

@@ -4,10 +4,16 @@ const {
 
 const checkPortConflicts = ({ buildTemplate, buildOptions, serviceName }) => {
   const portConflicts = [];
+
   const currentServiceExternalPorts = buildTemplate?.services?.[serviceName]?.ports?.map((port) => {
     return getExternalPort(port);
   }) ?? [];
 
+  // This is for services that have network mode set to host (and ports can't be specified in the docker-compose file)
+  const currentConfiguredServiceExternalPorts = Object.values(buildOptions?.serviceConfigurations?.services?.[serviceName]?.ports ?? [])?.map((port) => {
+    return getExternalPort(port);
+  }) ?? [];
+
   Object.keys(buildTemplate?.services ?? {}).forEach((service) => {
     if (service === serviceName) {
       return null; // Skip self
@@ -18,7 +24,7 @@ const checkPortConflicts = ({ buildTemplate, buildOptions, serviceName }) => {
     }) ?? [];
 
     checkingServiceExternalPorts.forEach((port) => {
-      if (currentServiceExternalPorts.includes(port)) {
+      if ([...currentConfiguredServiceExternalPorts, ...currentServiceExternalPorts].includes(port)) {
         portConflicts.push({
           type: 'service',
           name: serviceName,

.internal/api/src/utils/commonCompileLogic.js

@@ -91,6 +91,11 @@ const setModifiedPorts = ({ buildTemplate, buildOptions, serviceName }) => {
   const modifiedPortList = Object.keys(serviceConfig?.ports ?? {});
   let updated = false;
 
+  if (serviceTemplate.network_mode === 'host') {
+    delete buildTemplate?.services?.[serviceName]?.['ports'];
+    return true;
+  }
+
   for (let i = 0; i < modifiedPortList.length; i++) {
     (serviceTemplate?.ports ?? []).forEach((port, index) => {
       const eiPort = port.split('/')[0];
@@ -143,6 +148,10 @@ const setNetworkMode = ({ buildTemplate, buildOptions, serviceName }) => {
     if (serviceConfig.networkMode === 'none') {
       delete serviceTemplate['network_mode'];
     }
+
+    if (serviceTemplate.network_mode === 'host') {
+    delete buildTemplate?.services?.[serviceName]?.['ports'];
+    }
   }
 
   return currentNetworkMode !== serviceTemplate['network_mode'];

.internal/pycli/deps/api.py

@@ -16,6 +16,7 @@ def checkApiHealth(host, protocol="http://"):
       res['json'] = None
   except:
     res = {}
+    res['funcName'] = 'checkApiHealth'
     res['url'] = url
     res['apiRequest'] = None
     res['status'] = -1
@@ -39,6 +40,7 @@ def deleteBuild(host, build, protocol="http://"):
       res['json'] = None
   except:
     res = {}
+    res['funcName'] = 'deleteBuild'
     res['url'] = url
     res['apiRequest'] = None
     res['status'] = -1
@@ -69,6 +71,7 @@ def getTemplateBuildBootstrap(host, build, noFluff = True, protocol="http://"):
       res['json'] = None
   except:
     res = {}
+    res['funcName'] = 'getTemplateBuildBootstrap'
     res['url'] = url
     res['body'] = requestData
     res['apiRequest'] = None
@@ -101,6 +104,7 @@ def getPreviousBuildList(host, index = None, limit = None, protocol="http://"):
       res['json'] = None
   except:
     res = {}
+    res['funcName'] = 'getPreviousBuildList'
     res['url'] = url
     res['apiRequest'] = None
     res['status'] = -1
@@ -120,6 +124,187 @@ def checkWuiState(host, protocol="http://"):
     res['json'] = None
   except:
     res = {}
+    res['funcName'] = 'checkWuiState'
+    res['apiRequest'] = None
+    res['status'] = -1
+    res['text'] = None
+    res['json'] = None
+
+  return res
+
+def getBuildServicesList(host, protocol="http://"):
+  try:
+    url = '{protocol}{host}/templates/services/list'.format(host=host, protocol=protocol)
+
+    apiRequest = requests.get(url, timeout = 2)
+
+    res = {}
+    res['apiRequest'] = apiRequest
+    res['status'] = apiRequest.status_code
+    res['text'] = apiRequest.text
+    try:
+      res['json'] = apiRequest.json()
+    except:
+      res['json'] = None
+  except:
+    res = {}
+    res['funcName'] = 'getBuildServicesList'
+    res['url'] = url
+    res['apiRequest'] = None
+    res['status'] = -1
+    res['text'] = None
+    res['json'] = None
+
+  return res
+
+def getBuildServicesJsonList(host, protocol="http://"):
+  try:
+    url = '{protocol}{host}/templates/services/json'.format(host=host, protocol=protocol)
+
+    apiRequest = requests.get(url, timeout = 2)
+
+    res = {}
+    res['apiRequest'] = apiRequest
+    res['status'] = apiRequest.status_code
+    res['text'] = apiRequest.text
+    try:
+      res['json'] = apiRequest.json()
+    except:
+      res['json'] = None
+  except:
+    res = {}
+    res['funcName'] = 'getBuildServicesJsonList'
+    res['url'] = url
+    res['apiRequest'] = None
+    res['status'] = -1
+    res['text'] = None
+    res['json'] = None
+
+  return res
+
+def getBuildServicesYamlList(host, protocol="http://"):
+  try:
+    url = '{protocol}{host}/templates/services/yaml'.format(host=host, protocol=protocol)
+
+    apiRequest = requests.get(url, timeout = 2)
+
+    res = {}
+    res['apiRequest'] = apiRequest
+    res['status'] = apiRequest.status_code
+    res['text'] = apiRequest.text
+    res['json'] = None
+  except:
+    res = {}
+    res['funcName'] = 'getBuildServicesYamlList'
+    res['url'] = url
+    res['apiRequest'] = None
+    res['status'] = -1
+    res['text'] = None
+    res['json'] = None
+
+  return res
+
+def getBuildServicesMetaData(host, protocol="http://"):
+  try:
+    url = '{protocol}{host}/config/meta'.format(host=host, protocol=protocol)
+
+    apiRequest = requests.get(url, timeout = 2)
+
+    res = {}
+    res['apiRequest'] = apiRequest
+    res['status'] = apiRequest.status_code
+    res['text'] = apiRequest.text
+    try:
+      res['json'] = apiRequest.json()
+    except:
+      res['json'] = None
+  except:
+    res = {}
+    res['funcName'] = 'getBuildServicesMetaData'
+    res['url'] = url
+    res['apiRequest'] = None
+    res['status'] = -1
+    res['text'] = None
+    res['json'] = None
+
+  return res
+
+def getBuildServicesOptionsData(host, protocol="http://"):
+  try:
+    url = '{protocol}{host}/config/options'.format(host=host, protocol=protocol)
+
+    apiRequest = requests.get(url, timeout = 2)
+
+    res = {}
+    res['apiRequest'] = apiRequest
+    res['status'] = apiRequest.status_code
+    res['text'] = apiRequest.text
+    try:
+      res['json'] = apiRequest.json()
+    except:
+      res['json'] = None
+  except:
+    res = {}
+    res['funcName'] = 'getBuildServicesOptionsData'
+    res['url'] = url
+    res['apiRequest'] = None
+    res['status'] = -1
+    res['text'] = None
+    res['json'] = None
+
+  return res
+
+def saveBuild(host, selectedServices, serviceConfigurations = {}, protocol="http://"):
+  try:
+    url = '{protocol}{host}/build/save'.format(host=host, protocol=protocol)
+    requestData = {}
+    requestData['buildOptions'] = {}
+    requestData['buildOptions']['selectedServices'] = selectedServices
+    requestData['buildOptions']['serviceConfigurations'] = serviceConfigurations
+
+    apiRequest = requests.post(url = url, json = requestData, timeout = 2)
+
+    res = {}
+    res['apiRequest'] = apiRequest
+    res['status'] = apiRequest.status_code
+    res['text'] = apiRequest.text
+    try:
+      res['json'] = apiRequest.json()
+    except:
+      res['json'] = None
+  except:
+    res = {}
+    res['funcName'] = 'saveBuild'
+    res['url'] = url
+    res['apiRequest'] = None
+    res['status'] = -1
+    res['text'] = None
+    res['json'] = None
+
+  return res
+
+def checkBuild(host, selectedServices, serviceConfigurations = {}, protocol="http://"):
+  try:
+    requestData = {}
+    requestData['buildOptions'] = {}
+    requestData['buildOptions']['selectedServices'] = selectedServices
+    requestData['buildOptions']['serviceConfigurations'] = serviceConfigurations
+    url = '{protocol}{host}/build/dryrun'.format(host=host, protocol=protocol)
+
+    apiRequest = requests.post(url = url, json = requestData, timeout = 2)
+
+    res = {}
+    res['apiRequest'] = apiRequest
+    res['status'] = apiRequest.status_code
+    res['text'] = apiRequest.text
+    try:
+      res['json'] = apiRequest.json()
+    except:
+      res['json'] = None
+  except:
+    res = {}
+    res['funcName'] = 'checkBuild'
+    res['url'] = url
     res['apiRequest'] = None
     res['status'] = -1
     res['text'] = None

.internal/pycli/entry.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# cd .internal/pycli && nodemon --no-stdin --exec python3 entry.py
+# export API_ADDR=localhost:32128 && export HOST_CON_API=localhost:32128 && cd .internal/pycli; nodemon --no-stdin --exec python3 entry.py
 
 import blessed
 import yaml

.internal/pycli/menu_main.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+# export API_ADDR=localhost:32128 && export HOST_CON_API=localhost:32128 && cd .internal/pycli; nodemon --no-stdin --exec python3 entry.py
+
 from blessed import Terminal
 import sys
 import subprocess
@@ -231,7 +233,7 @@ def skipItem(currentMenuItemIndex, direction):
 
 baseMenu = [
   ["Install Builds", installBuild],
-  # ["Create Build", buildStack], # Not yet ready
+  ["Create Build", buildStack], # Not yet ready
   ["Docker Commands", dockerCommands],
   ["Miscellaneous Commands", miscCommands],
   ["Backup and Restore", backupAndRestore],

.internal/templates/services/influxdb/build.js

@@ -11,7 +11,9 @@ const ServiceBuilder = ({
     setModifiedPorts,
     setLoggingState,
     setNetworkMode,
-    setNetworks
+    setNetworks,
+    setDevices,
+    setEnvironmentVariables
   } = require('../../../src/utils/commonCompileLogic');
 
   const {

install.sh

@@ -294,6 +294,7 @@ if [[ "$HAS_ERROR" == "true" ]]; then
   echo "--------"
   echo ""
   echo "An error occured installing IOTstack. Please review the output above."
+  echo "If you have just installed the OS, try giving the RPi 30 minutes to complete setup and try installing IOTstack again."
   read -n 1 -s -r -p "Press any key to continue"
 else
   echo "IOTstack setup completed"