Merge pull request #104 from cloudblue/add_node_to_image

Add node to image

Author: ffaraone

Dockerfile

@@ -1,4 +1,16 @@
-FROM python:3.8
+FROM python:3.10
+
+ENV NODE_VERSION=16.17.1
+
+RUN apt install -y curl
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
+ENV NVM_DIR=/root/.nvm
+RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
+RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}
+RUN . "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION}
+ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
+RUN node --version
+RUN npm --version
 
 ARG RUNNER_VERSION
 

connect/eaas/runner/workers/web.py

@@ -99,12 +99,18 @@ async def process_task(self, task):
             )
         await self.send(message)
 
+    def get_logging_level(self):
+        if self.config.logging_level:
+            return self.config.logging_level
+        current_level = logging.getLogger('eaas').getEffectiveLevel()
+        return logging.getLevelName(current_level)
+
     def get_internal_headers(self, task):
         headers = {}
         headers['X-Connect-Api-Gateway-Url'] = self.config.get_api_url()
         headers['X-Connect-User-Agent'] = self.config.get_user_agent()['User-Agent']
         headers['X-Connect-Extension-Id'] = self.config.service_id
-        headers['X-Connect-Logging-Level'] = self.config.logging_level or 'DEBUG'
+        headers['X-Connect-Logging-Level'] = self.get_logging_level()
         headers['X-Connect-Config'] = json.dumps(self.config.variables)
 
         if task.options.api_key:

entrypoint.sh

@@ -35,6 +35,10 @@ if [[ "$@" == *"cextrun"* ]]; then
 
     if [ -d "$DIST_DIR" ]; then rm -Rf $DIST_DIR; fi
 
+    if [ -f "package.json" ]; then
+        npm run build
+    fi
+
     poetry build
 
     pip install -U pip && pip install -U --force-reinstall $DIST_DIR/*.whl