use inject & templates

Dockerfile

@@ -13,20 +13,17 @@ WORKDIR /app/chat-ui
 
 
 COPY .template.env.local .template.env.local
-
+COPY --chmod=777 inject.sh inject.sh
 RUN mkdir defaults
 ADD defaults /defaults
 RUN chmod -R 777 /defaults
+
 RUN --mount=type=secret,id=MODEL_NAME,mode=0444 \
     --mount=type=secret,id=MODEL_PARAMS,mode=0444 \
     --mount=type=secret,id=MONGODB_URL,mode=0444 \
     --mount=type=secret,id=APP_COLOR,mode=0444 \
     --mount=type=secret,id=APP_NAME,mode=0444 \
-    MODEL_NAME=$(cat /run/secrets/MODEL_NAME 2> /dev/null | grep '^' || cat /defaults/MODEL_NAME) && export MODEL_NAME \
-    && MODEL_PARAMS=$(cat /run/secrets/MODEL_PARAMS 2> /dev/null | grep '^' ||cat  /defaults/MODEL_PARAMS) && export MODEL_PARAMS \
-    && MONGODB_URL=$(cat /run/secrets/MONGODB_URL 2> /dev/null | grep '^' || cat /defaults/MONGODB_URL) && export MONGODB_URL \
-    && APP_COLOR=$(cat /run/secrets/APP_COLOR 2> /dev/null | grep '^' || cat /defaults/APP_COLOR) && export APP_COLOR \
-    && APP_NAME=$(cat /run/secrets/APP_NAME 2> /dev/null | grep '^' || cat /defaults/APP_NAME) && export APP_NAME \
+    inject.sh \
     && envsubst < ".template.env.local" > ".env.local"
 
 
@@ -42,19 +39,20 @@ FROM ghcr.io/huggingface/text-generation-inference:latest
 ENV TZ=Europe/Paris \
     PORT=3000
 
+
+COPY .template.env.local .template.env.local
+COPY --chmod=777 inject.sh inject.sh
 RUN mkdir defaults
 ADD defaults /defaults
 RUN chmod -R 777 /defaults
+
 RUN --mount=type=secret,id=MODEL_NAME,mode=0444 \
     --mount=type=secret,id=MODEL_PARAMS,mode=0444 \
     --mount=type=secret,id=MONGODB_URL,mode=0444 \
     --mount=type=secret,id=APP_COLOR,mode=0444 \
     --mount=type=secret,id=APP_NAME,mode=0444 \
-    MODEL_NAME=$(cat /run/secrets/MODEL_NAME 2> /dev/null | grep '^' || cat /defaults/MODEL_NAME) && export MODEL_NAME \
-    && MODEL_PARAMS=$(cat /run/secrets/MODEL_PARAMS 2> /dev/null | grep '^' ||cat  /defaults/MODEL_PARAMS) && export MODEL_PARAMS \
-    && MONGODB_URL=$(cat /run/secrets/MONGODB_URL 2> /dev/null | grep '^' || cat /defaults/MONGODB_URL) && export MONGODB_URL \
-    && APP_COLOR=$(cat /run/secrets/APP_COLOR 2> /dev/null | grep '^' || cat /defaults/APP_COLOR) && export APP_COLOR \
-    && APP_NAME=$(cat /run/secrets/APP_NAME 2> /dev/null | grep '^' || cat /defaults/APP_NAME) && export APP_NAME;
+    inject.sh \
+    && envsubst < "entrypoint.sh.template" > "entrypoint.sh"
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     gnupg \

entrypoint.sh → entrypoint.sh.template

@@ -4,7 +4,7 @@
 mongod &
 
 # Start the text-generation-inference process
-text-generation-launcher --model-id $MODEL_NAME --num-shard 1 --port 8080 --trust-remote-code &
+text-generation-launcher --model-id ${MODEL_NAME} --num-shard 1 --port 8080 --trust-remote-code &
 
 # Wait for text-generation-inference to start
 curl --retry 60 --retry-delay 10 --retry-connrefused http://127.0.0.1:8080/health

inject.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+MODEL_NAME=$(cat /run/secrets/MODEL_NAME 2> /dev/null | grep '^' || cat /defaults/MODEL_NAME) 
+MODEL_PARAMS=$(cat /run/secrets/MODEL_PARAMS 2> /dev/null | grep '^' ||cat  /defaults/MODEL_PARAMS)
+MONGODB_URL=$(cat /run/secrets/MONGODB_URL 2> /dev/null | grep '^' || cat /defaults/MONGODB_URL)
+APP_COLOR=$(cat /run/secrets/APP_COLOR 2> /dev/null | grep '^' || cat /defaults/APP_COLOR)
+APP_NAME=$(cat /run/secrets/APP_NAME 2> /dev/null | grep '^' || cat /defaults/APP_NAME)
+$*