From a7e14e2b4849350d4cc14df366255458531a1a4f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 10 Apr 2024 16:17:20 -0400 Subject: [PATCH] Add TimeoutStartSec=infinity to QUADLET.image file Also share the same image file between all of the recipes. Signed-off-by: Daniel J Walsh --- recipes/common/Makefile.common | 1 + recipes/common/quadlet/app.image | 10 ++++++++++ .../chatbot/quadlet/chatbot.image | 8 +------- .../codegen/quadlet/codegen.image | 9 +-------- .../natural_language_processing/rag/quadlet/rag.image | 8 +------- .../summarizer/quadlet/summarizer.image | 8 +------- 6 files changed, 15 insertions(+), 29 deletions(-) create mode 100644 recipes/common/quadlet/app.image mode change 100644 => 120000 recipes/natural_language_processing/chatbot/quadlet/chatbot.image mode change 100644 => 120000 recipes/natural_language_processing/codegen/quadlet/codegen.image mode change 100644 => 120000 recipes/natural_language_processing/rag/quadlet/rag.image mode change 100644 => 120000 recipes/natural_language_processing/summarizer/quadlet/summarizer.image diff --git a/recipes/common/Makefile.common b/recipes/common/Makefile.common index 68de97f3..6f59ad60 100644 --- a/recipes/common/Makefile.common +++ b/recipes/common/Makefile.common @@ -134,6 +134,7 @@ quadlet: -e "s|APP_IMAGE|${APP_IMAGE}|g" \ -e "s|MODEL_IMAGE|${MODEL_IMAGE}|g" \ -e "s|CHROMADB_IMAGE|${CHROMADB_IMAGE}|g" \ + -e "s|APP|${APP}|g" \ quadlet/${APP}.image \ > build/${APP}.image sed -e "s|SERVER_IMAGE|${SERVER_IMAGE}|" \ diff --git a/recipes/common/quadlet/app.image b/recipes/common/quadlet/app.image new file mode 100644 index 00000000..2eddbfc9 --- /dev/null +++ b/recipes/common/quadlet/app.image @@ -0,0 +1,10 @@ +[Install] +WantedBy=APP.service + +[Service] +TimeoutStartSec=infinity + +[Image] +Image=APP_IMAGE +Image=MODEL_IMAGE +Image=SERVER_IMAGE diff --git a/recipes/natural_language_processing/chatbot/quadlet/chatbot.image b/recipes/natural_language_processing/chatbot/quadlet/chatbot.image deleted file mode 100644 index 68caa5ef..00000000 --- a/recipes/natural_language_processing/chatbot/quadlet/chatbot.image +++ /dev/null @@ -1,7 +0,0 @@ -[Install] -WantedBy=chatbot.service - -[Image] -Image=APP_IMAGE -Image=MODEL_IMAGE -Image=SERVER_IMAGE diff --git a/recipes/natural_language_processing/chatbot/quadlet/chatbot.image b/recipes/natural_language_processing/chatbot/quadlet/chatbot.image new file mode 120000 index 00000000..deec53bc --- /dev/null +++ b/recipes/natural_language_processing/chatbot/quadlet/chatbot.image @@ -0,0 +1 @@ +../../../common/quadlet/app.image \ No newline at end of file diff --git a/recipes/natural_language_processing/codegen/quadlet/codegen.image b/recipes/natural_language_processing/codegen/quadlet/codegen.image deleted file mode 100644 index d1a7d74d..00000000 --- a/recipes/natural_language_processing/codegen/quadlet/codegen.image +++ /dev/null @@ -1,8 +0,0 @@ -[Install] -WantedBy=codegen.service - -[Image] -Image=APP_IMAGE -Image=MODEL_IMAGE -Image=SERVER_IMAGE - diff --git a/recipes/natural_language_processing/codegen/quadlet/codegen.image b/recipes/natural_language_processing/codegen/quadlet/codegen.image new file mode 120000 index 00000000..deec53bc --- /dev/null +++ b/recipes/natural_language_processing/codegen/quadlet/codegen.image @@ -0,0 +1 @@ +../../../common/quadlet/app.image \ No newline at end of file diff --git a/recipes/natural_language_processing/rag/quadlet/rag.image b/recipes/natural_language_processing/rag/quadlet/rag.image deleted file mode 100644 index d6e9e117..00000000 --- a/recipes/natural_language_processing/rag/quadlet/rag.image +++ /dev/null @@ -1,7 +0,0 @@ -[Install] -WantedBy=rag.service - -[Image] -Image=APP_IMAGE -Image=MODEL_IMAGE -Image=SERVER_IMAGE diff --git a/recipes/natural_language_processing/rag/quadlet/rag.image b/recipes/natural_language_processing/rag/quadlet/rag.image new file mode 120000 index 00000000..deec53bc --- /dev/null +++ b/recipes/natural_language_processing/rag/quadlet/rag.image @@ -0,0 +1 @@ +../../../common/quadlet/app.image \ No newline at end of file diff --git a/recipes/natural_language_processing/summarizer/quadlet/summarizer.image b/recipes/natural_language_processing/summarizer/quadlet/summarizer.image deleted file mode 100644 index c4336439..00000000 --- a/recipes/natural_language_processing/summarizer/quadlet/summarizer.image +++ /dev/null @@ -1,7 +0,0 @@ -[Install] -WantedBy=summarizer.service - -[Image] -Image=quay.io/ai-lab/mistral-7b-instruct:latest -Image=quay.io/ai-lab/llamacpp-python:latest -Image=quay.io/redhat-et/locallm-text-summarizer:latest diff --git a/recipes/natural_language_processing/summarizer/quadlet/summarizer.image b/recipes/natural_language_processing/summarizer/quadlet/summarizer.image new file mode 120000 index 00000000..deec53bc --- /dev/null +++ b/recipes/natural_language_processing/summarizer/quadlet/summarizer.image @@ -0,0 +1 @@ +../../../common/quadlet/app.image \ No newline at end of file