truss 0.10.9rc541__tar.gz → 0.10.9rc543__tar.gz

{truss-0.10.9rc541 → truss-0.10.9rc543}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.10.9rc541
+Version: 0.10.9rc543
 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.9rc541 → truss-0.10.9rc543}/pyproject.toml

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

{truss-0.10.9rc541 → truss-0.10.9rc543}/truss/templates/base.Dockerfile.jinja

@@ -23,14 +23,16 @@ RUN mkdir -p ${APP_HOME} {{ control_server_dir }}
 RUN useradd -u {{ app_user_uid }} -ms /bin/bash {{ app_username }}
 {% endblock %} {#- endblock user_setup #}
 
-{%- if enable_model_container_admin_commands %}
+{%- if non_root_user %}
+  {%- if enable_model_container_admin_commands %}
 RUN apt update && apt install -y sudo
 {%- set allowed_admin_commands = ["/usr/bin/apt install *", "/usr/bin/apt update"] %}
 RUN echo "Defaults:{{ app_username }} passwd_tries=0\n{{ app_username }} ALL=(root) NOPASSWD: {{ allowed_admin_commands | join(", ") }}" > /etc/sudoers.d/app-packages
 RUN chmod 0440 /etc/sudoers.d/app-packages
 {#- optional but good practice: check if the sudoers file is valid #}
 RUN visudo -c
-{%- endif %}
+  {%- endif %} {#- endif enable_model_container_admin_commands #}
+{%- endif %} {#- endif non_root_user #}
 
 {%- set UV_VERSION = "0.7.19" %}
 {#

{truss-0.10.9rc541 → truss-0.10.9rc543}/truss/templates/server.Dockerfile.jinja

@@ -102,6 +102,11 @@ COPY --chown={{ default_owner }} ./{{ config.model_module_dir }} ${APP_HOME}/mod
 {% endblock %} {#- endblock app_copy #}
 
 {% 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 && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         curl nginx && rm -rf /var/lib/apt/lists/*
@@ -124,7 +129,6 @@ 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 }}"]
@@ -134,7 +138,6 @@ 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"]
@@ -142,7 +145,6 @@ 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"]