From 1d9c4a8b05888788647fa254fe6357a90cf82074 Mon Sep 17 00:00:00 2001 From: yhoupert Date: Fri, 19 Jan 2024 10:05:28 +0100 Subject: [PATCH] Upgrade linto-admin allowing to build docker --- README.md | 15 ++++++++---- platform/business-logic-server/.dockerenv | 27 --------------------- platform/linto-admin/Dockerfile | 7 ++++-- platform/linto-admin/vue_app/package.json | 2 +- platform/linto-admin/webserver/package.json | 2 +- 5 files changed, 17 insertions(+), 36 deletions(-) delete mode 100644 platform/business-logic-server/.dockerenv diff --git a/README.md b/README.md index 8eec159..c5e0298 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,13 @@ # LinTO-Agent +## Platform LinTO-Agent contain all tools allowing to play with LinTO - - linto-admin : central manager for a given fleet of LinTO clients - - business-logic-server : deploy and executes a linto workflow - - overwatch : handle the authentification and loging aspect of a linto fleet - - service-broker : the communication pipeline between services and subservices - - stt-service-manager : deploy speech to text service \ No newline at end of file +- linto-admin : central manager for a given fleet of LinTO clients +- business-logic-server : deploy and executes a linto workflow +- overwatch : handle the authentification and loging aspect of a linto fleet +- service-broker : the communication pipeline between services and subservices +- stt-service-manager : deploy speech to text service + +## Setup + +LinTO Agent is meant to get deployed on a Docker Swarm cluster. Please read thouroughly the [infrastructure setup guide](https://doc.linto.ai/) and the following documentation located on `stack/docs/README.md` BEFORE you run the startup script. \ No newline at end of file diff --git a/platform/business-logic-server/.dockerenv b/platform/business-logic-server/.dockerenv deleted file mode 100644 index 042d760..0000000 --- a/platform/business-logic-server/.dockerenv +++ /dev/null @@ -1,27 +0,0 @@ -LINTO_SHARED_MOUNT=~/linto_shared_mount/ -LINTO_STACK_DOMAIN=localhost -# LINTO_STACK_NPM_CUSTOM_REGISTRY=https://registry.npmjs.org/ -# NODE_ENV=production - -#LINTO_STACK Configuration -LINTO_STACK_USE_SSL=false - -#LINTO-RED Configuration -LINTO_STACK_BLS_HTTP_PORT=80 - -LINTO_STACK_BLS_SERVICE_UI_PATH=/redui -LINTO_STACK_BLS_SERVICE_API_PATH=/red - -LINTO_STACK_BLS_USE_LOGIN=false -LINTO_STACK_BLS_USER= -LINTO_STACK_BLS_PASSWORD= - -#STACK Configuration -LINTO_STACK_OVERWATCH_SERVICE=linto-platform-overwatch -LINTO_STACK_OVERWATCH_BASE_PATH=/overwatch - -LINTO_STACK_BLS_API_MAX_LENGTH=5mb - -LINTO_STACK_TOCK_BOT_API=linto-tock-bot-api -LINTO_STACK_TOCK_SERVICE=linto-tock-nlu-web -LINTO_STACK_TOCK_NLP_API=linto-tock-nlp-api \ No newline at end of file diff --git a/platform/linto-admin/Dockerfile b/platform/linto-admin/Dockerfile index 2c9fad7..05e8b15 100644 --- a/platform/linto-admin/Dockerfile +++ b/platform/linto-admin/Dockerfile @@ -1,7 +1,10 @@ -FROM node:latest +# FROM node:latest +FROM node:20.9.0 # Gettext for envsubst being called form entrypoint script + RUN apt-get update -y && \ apt-get install gettext -y +# RUN apt-get install python3 -y COPY ./vue_app /usr/src/app/linto-admin/vue_app COPY ./webserver /usr/src/app/linto-admin/webserver @@ -9,7 +12,7 @@ COPY ./docker-entrypoint.sh / COPY ./wait-for-it.sh / WORKDIR /usr/src/app/linto-admin/vue_app -RUN npm install && npm install -s node-sass +RUN npm install WORKDIR /usr/src/app/linto-admin/webserver RUN npm install diff --git a/platform/linto-admin/vue_app/package.json b/platform/linto-admin/vue_app/package.json index 9655ed6..69a4fe5 100644 --- a/platform/linto-admin/vue_app/package.json +++ b/platform/linto-admin/vue_app/package.json @@ -16,7 +16,7 @@ "babel-eslint": "^10.1.0", "html-webpack-plugin": "^3.2.0", "moment": "^2.24.0", - "node-sass": "^4.13.1", + "node-sass": "^9.0.0", "randomstring": "^1.1.5", "socket.io-client": "^2.3.0", "vue": "^2.6.11", diff --git a/platform/linto-admin/webserver/package.json b/platform/linto-admin/webserver/package.json index 575c2be..fdecf03 100644 --- a/platform/linto-admin/webserver/package.json +++ b/platform/linto-admin/webserver/package.json @@ -48,8 +48,8 @@ "mongodb": "^3.1.13", "mqtt": "^3.0.0", "multer": "^1.4.2", - "node-sass": "^4.12.0", "npm": "^6.10.1", + "node-sass": "^9.0.0", "path": "^0.12.7", "pg": "^7.5.0", "pm2": "^2.10.4",