Update Dockerfile

Dockerfile

@@ -30,18 +30,20 @@ RUN mkdir defaults
 ADD defaults /defaults
 RUN chmod -R 777 /defaults
 RUN --mount=type=secret,id=MONGODB_URL,mode=0444 \
-    MODEL_NAME="${MODEL_NAME:="$(cat /defaults/MODEL_NAME)"}" && export MODEL_NAME \
-    && MODEL_PARAMS="${MODEL_PARAMS:="$(cat /defaults/MODEL_PARAMS)"}" && export MODEL_PARAMS \
-    && MODEL_PROMPT_TEMPLATE="${MODEL_PROMPT_TEMPLATE:="$(cat /defaults/MODEL_PROMPT_TEMPLATE)"}" && export MODEL_PROMPT_TEMPLATE \
-    && APP_COLOR="${APP_COLOR:="$(cat /defaults/APP_COLOR)"}" && export APP_COLOR \
-    && APP_NAME="${APP_NAME:="$(cat /defaults/APP_NAME)"}" && export APP_NAME \
-    && MONGODB_URL=$(cat /run/secrets/MONGODB_URL > /dev/null | grep '^' || cat /defaults/MONGODB_URL) && export MONGODB_URL && \
-    echo "${MONGODB_URL}" && \
-    envsubst < ".env.local.template" > ".env.local" \ 
+    --mount=type=secret,id=BASEURL,mode=0444 \
+    --mount=type=secret,id=HF_TOKEN,mode=0444 \
+    export MODEL_NAME="${MODEL_NAME:=$(cat /defaults/MODEL_NAME)}" \
+    && export MODEL_PARAMS="${MODEL_PARAMS:=$(cat /defaults/MODEL_PARAMS)}" \
+    && export MODEL_PROMPT_TEMPLATE="${MODEL_PROMPT_TEMPLATE:=$(cat /defaults/MODEL_PROMPT_TEMPLATE)}" \
+    && export APP_COLOR="${APP_COLOR:=$(cat /defaults/APP_COLOR)}" \
+    && export APP_NAME="${APP_NAME:=$(cat /defaults/APP_NAME)}" \
+    && export MONGODB_URL=$(cat /run/secrets/MONGODB_URL | grep '^') \
+    && export BASEURL=$(cat /run/secrets/BASEURL | grep '^') \
+    && export HF_TOKEN=$(cat /run/secrets/HF_TOKEN | grep '^') \
+    && envsubst < ".env.local.template" > ".env.local" \
     && rm .env.local.template
 
 
-
 RUN --mount=type=cache,target=/app/.npm \
     npm set cache /app/.npm && \
     npm ci
@@ -78,21 +80,9 @@ RUN --mount=type=secret,id=MONGODB_URL,mode=0444 \
     && MODEL_PROMPT_TEMPLATE="${MODEL_PROMPT_TEMPLATE:="$(cat /defaults/MODEL_PROMPT_TEMPLATE)"}" && export MODEL_PROMPT_TEMPLATE \
     && APP_COLOR="${APP_COLOR:="$(cat /defaults/APP_COLOR)"}" && export APP_COLOR \
     && APP_NAME="${APP_NAME:="$(cat /defaults/APP_NAME)"}" && export APP_NAME \
-    && MONGODB_URL=$(cat /run/secrets/MONGODB_URL > /dev/null | grep '^' || cat /defaults/MONGODB_URL) && export MONGODB_URL &&  \
-    envsubst < "entrypoint.sh.template" > "entrypoint.sh" \
+    && envsubst < "entrypoint.sh.template" > "entrypoint.sh" \
     && rm entrypoint.sh.template
 
-
-RUN curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | \
-    gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg \
-   --dearmor
-
-RUN echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    mongodb-org && \
-    rm -rf /var/lib/apt/lists/*
-
 RUN mkdir -p /data/db
 RUN chown -R 1000:1000 /data
 
@@ -115,12 +105,13 @@ ENV HOME=/home/user \
 
 RUN npm config set prefix /home/user/.local
 RUN npm install -g pm2
+RUN npm install -g dotenv-cli
 
 COPY --from=chatui-builder --chown=1000 /app/chat-ui/node_modules /app/node_modules
 COPY --from=chatui-builder --chown=1000 /app/chat-ui/package.json /app/package.json
 COPY --from=chatui-builder --chown=1000 /app/chat-ui/build /app/build
+COPY --from=chatui-builder --chown=1000 /app/chat-ui/.env /app/.env
+COPY --from=chatui-builder --chown=1000 /app/chat-ui/.env.local /app/.env.local
 
 ENTRYPOINT ["/bin/bash"]
-CMD ["entrypoint.sh"]
-
-
+CMD ["entrypoint.sh"]