truss 0.10.9rc546__tar.gz → 0.10.9rc547__tar.gz

{truss-0.10.9rc546 → truss-0.10.9rc547}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.10.9rc546
+Version: 0.10.9rc547
 Summary: A seamless bridge from model development to model delivery
 Project-URL: Repository, https://github.com/basetenlabs/truss
 Project-URL: Homepage, https://truss.baseten.co

{truss-0.10.9rc546 → truss-0.10.9rc547}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truss"
-version = "0.10.9rc546"
+version = "0.10.9rc547"
 description = "A seamless bridge from model development to model delivery"
 authors = [
     { name = "Pankaj Gupta", email = "no-reply@baseten.co" },

{truss-0.10.9rc546 → truss-0.10.9rc547}/truss/templates/base.Dockerfile.jinja

@@ -23,6 +23,7 @@ RUN mkdir -p ${APP_HOME} {{ control_server_dir }}
 RUN useradd -u {{ app_user_uid }} -ms /bin/bash {{ app_username }}
 {% endblock %} {#- endblock user_setup #}
 
+{#- at the very beginning, set non-interactive mode for apt #}
 ENV DEBIAN_FRONTEND=noninteractive
 
 {%- if non_root_user and enable_model_container_admin_commands %}
@@ -60,13 +61,13 @@ RUN {{ python_exec_path }} -c "import sys; \
 {% endblock %}
 
 {% block install_uv %}
-# Add the user's local bin to the path, used by uv.
-ENV PATH=${PATH}:${HOME}/.local/bin
 {# Install `uv` and `curl` if not already present in the image. #}
 RUN if ! command -v uv >/dev/null 2>&1; then \
     command -v curl >/dev/null 2>&1 || (apt update && apt install -y curl) && \
     curl -LsSf --retry 5 --retry-delay 5 https://astral.sh/uv/{{ UV_VERSION }}/install.sh | sh; \
 fi
+# Add the user's local bin to the path, used by uv.
+ENV PATH=${PATH}:${HOME}/.local/bin
 {% endblock %}
 
 {% block base_image_patch %}

{truss-0.10.9rc546 → truss-0.10.9rc547}/truss/templates/server.Dockerfile.jinja

@@ -102,10 +102,6 @@ COPY --chown={{ default_owner }} ./{{ config.model_module_dir }} ${APP_HOME}/mod
 
 {% block run %}
 
-{%- if non_root_user %}
-RUN chown -R {{ app_username }}:{{ app_username }} ${HOME} ${APP_HOME}
-{%- endif %} {#- endif non_root_user #}
-
     {%- if config.docker_server %}
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
         curl nginx && rm -rf /var/lib/apt/lists/*
@@ -128,6 +124,7 @@ RUN rm -f /etc/nginx/sites-enabled/default
 {#- nginx writes to /var/lib/nginx, /var/log/nginx, and /run directories #}
 {% set nginx_dirs = ["/var/lib/nginx", "/var/log/nginx", "/run"] %}
 RUN chown -R {{ app_username }}:{{ app_username }} {{ nginx_dirs | join(" ") }}
+RUN chown -R {{ app_username }}:{{ app_username }} ${HOME} ${APP_HOME}
 USER {{ app_username }}
 {%- endif %} {#- endif non_root_user #}
 ENTRYPOINT ["/docker_server/.venv/bin/supervisord", "-c", "{{ supervisor_config_path }}"]
@@ -138,6 +135,7 @@ ENV CONTROL_SERVER_PORT="8080"
 ENV INFERENCE_SERVER_PORT="8090"
 ENV SERVER_START_CMD="/control/.env/bin/python /control/control/server.py"
 {%- if non_root_user %}
+RUN chown -R {{ app_username }}:{{ app_username }} ${HOME} ${APP_HOME}
 USER {{ app_username }}
 {%- endif %} {#- endif non_root_user #}
 ENTRYPOINT ["/control/.env/bin/python", "/control/control/server.py"]
@@ -146,6 +144,7 @@ ENTRYPOINT ["/control/.env/bin/python", "/control/control/server.py"]
 ENV INFERENCE_SERVER_PORT="8080"
 ENV SERVER_START_CMD="{{ python_executable }} /app/main.py"
 {%- if non_root_user %}
+RUN chown -R {{ app_username }}:{{ app_username }} ${HOME} ${APP_HOME}
 USER {{ app_username }}
 {%- endif %} {#- endif non_root_user #}
 ENTRYPOINT ["{{ python_executable }}", "/app/main.py"]