From 598380d0c4fc59b6f246402121ac907dcda3ec62 Mon Sep 17 00:00:00 2001
From: John Duggan <dugganjw@ornl.gov>
Date: Mon, 16 Mar 2026 07:36:44 -0400
Subject: [PATCH 1/3] Remove Docker ENTRYPOINT

---
 ... if application_type != 'Minimal' %}Dockerfile{% endif %}.j2 | 2 +-
 template_sources/xml/tool.xml.j2                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2 b/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2
index 0269fa0..11bbd57 100644
--- a/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2	
+++ b/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2	
@@ -49,7 +49,7 @@ RUN curl -fsSL https://pixi.sh/install.sh | sh
 ENV PATH="/root/.pixi/bin:${PATH}"
 RUN pixi install -e production
 SHELL [ "pixi", "run", "-e", "production" ]
-ENTRYPOINT [ "pixi", "run", "-e", "production", "--manifest-path", "/src/pyproject.toml" ]
+ENTRYPOINT []
 
 RUN pixi add --pypi supervisor
 RUN scripts/generate_static_client.sh
diff --git a/template_sources/xml/tool.xml.j2 b/template_sources/xml/tool.xml.j2
index 3ab4aad..1d9dc60 100644
--- a/template_sources/xml/tool.xml.j2
+++ b/template_sources/xml/tool.xml.j2
@@ -19,7 +19,7 @@
         <environment_variable name="EP_PATH" inject="entry_point_path_for_label">app_entry</environment_variable>
     </environment_variables>
      <command><![CDATA[
-        {% if application_type in ['Nova Application', 'Tutorial'] and framework == 'Trame' %}supervisord > >(tee -a $output) 2> >(tee -a $output >&2)
+        {% if application_type in ['Nova Application', 'Tutorial'] and framework == 'Trame' %}pixi run -e production --manifest-path /src/pyproject.toml supervisord > >(tee -a $output) 2> >(tee -a $output >&2)
         {% elif application_type == 'Minimal' %} echo "Container ran successfully."
         {% else %}python3.10 -m {{ python_package | replace('-', '_') }} > >(tee -a $output) 2> >(tee -a $output >&2){% endif %}
     ]]></command>

From 88ab66635858b14103deb013f45e0c55f2e4eb9d Mon Sep 17 00:00:00 2001
From: John Duggan <dugganjw@ornl.gov>
Date: Mon, 16 Mar 2026 09:00:59 -0400
Subject: [PATCH 2/3] Set permissions on /root

---
 ... if application_type != 'Minimal' %}Dockerfile{% endif %}.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2 b/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2
index 11bbd57..4327921 100644
--- a/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2	
+++ b/template_sources/dockerfiles/{% if application_type != 'Minimal' %}Dockerfile{% endif %}.j2	
@@ -54,7 +54,7 @@ ENTRYPOINT []
 RUN pixi add --pypi supervisor
 RUN scripts/generate_static_client.sh
 
-RUN chmod og+rwX -R /src
+RUN chmod og+rwX -R /root /src
 
 CMD [ "supervisord" ]
 {%- endif -%}

From 71c451ae2a661e385dd80d69fee97270fae2fcc1 Mon Sep 17 00:00:00 2001
From: John Duggan <dugganjw@ornl.gov>
Date: Mon, 16 Mar 2026 09:04:15 -0400
Subject: [PATCH 3/3] Use -m instead of --manifest-path

---
 template_sources/xml/tool.xml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template_sources/xml/tool.xml.j2 b/template_sources/xml/tool.xml.j2
index 1d9dc60..20dd54b 100644
--- a/template_sources/xml/tool.xml.j2
+++ b/template_sources/xml/tool.xml.j2
@@ -19,7 +19,7 @@
         <environment_variable name="EP_PATH" inject="entry_point_path_for_label">app_entry</environment_variable>
     </environment_variables>
      <command><![CDATA[
-        {% if application_type in ['Nova Application', 'Tutorial'] and framework == 'Trame' %}pixi run -e production --manifest-path /src/pyproject.toml supervisord > >(tee -a $output) 2> >(tee -a $output >&2)
+        {% if application_type in ['Nova Application', 'Tutorial'] and framework == 'Trame' %}pixi run -e production -m /src/pyproject.toml supervisord > >(tee -a $output) 2> >(tee -a $output >&2)
         {% elif application_type == 'Minimal' %} echo "Container ran successfully."
         {% else %}python3.10 -m {{ python_package | replace('-', '_') }} > >(tee -a $output) 2> >(tee -a $output >&2){% endif %}
     ]]></command>