Merge branch 'features/worker' of https://github.com/Tiledesk/tiledes…

…k-llm into features/worker

Dockerfile

@@ -1,3 +1,4 @@
+# STAGE 1: LLM
 FROM python:3.10
 
 WORKDIR /tiledesk-llm
@@ -23,5 +24,47 @@ EXPOSE 8000
 COPY entrypoint.sh /tiledesk-llm/entrypoint.sh
 RUN chmod +x /tiledesk-llm/entrypoint.sh
 
-ENTRYPOINT ["/tiledesk-llm/entrypoint.sh"]
+# STAGE 2: WORKER
 
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN apt-get install -y nodejs
+
+####
+RUN npm install -g [email protected]
+
+#RUN sed -i 's/stable\/updates/stable-security\/updates/' /etc/apt/sources.list
+
+RUN apt-get update
+
+# Create app directory
+WORKDIR /usr/src/app
+COPY ./worker .
+
+
+ARG NPM_TOKEN
+
+RUN if [ "$NPM_TOKEN" ]; \
+    then RUN COPY .npmrc_ .npmrc \
+    else export SOMEVAR=world; \
+    fi
+
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY worker/package*.json ./
+
+RUN npm install --production
+
+
+
+RUN rm -f .npmrc
+
+# Bundle app source
+#COPY . .
+
+WORKDIR /tiledesk-llm
+
+EXPOSE 3009
+
+ENTRYPOINT ["sh","-c","/tiledesk-llm/entrypoint.sh & node /usr/src/app/index.js"]

__Dockerfile_2

@@ -38,6 +38,8 @@ RUN apt-get update
 
 # Create app directory
 WORKDIR /usr/src/app
+COPY ./worker .
+
 
 ARG NPM_TOKEN
 
@@ -59,10 +61,10 @@ RUN npm install --production
 RUN rm -f .npmrc
 
 # Bundle app source
-COPY . .
+#COPY . .
 
 WORKDIR /tiledesk-llm
 
 EXPOSE 3009
 
-ENTRYPOINT ["/tiledesk-llm/entrypoint.sh", "&", "node", "/usr/src/app/index.js"]
+ENTRYPOINT ["sh","-c","/tiledesk-llm/entrypoint.sh & node /usr/src/app/index.js"]