truss 0.10.9rc545__py3-none-any.whl → 0.10.9rc547__py3-none-any.whl

truss/templates/base.Dockerfile.jinja

@@ -23,18 +23,17 @@ 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 %}
-  {%- if enable_model_container_admin_commands %}
+{%- if non_root_user and 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 enable_model_container_admin_commands #}
-{%- endif %} {#- endif non_root_user #}
+{%- endif %} {#- endif non_root_user and enable_model_container_admin_commands #}
 
 {%- set UV_VERSION = "0.7.19" %}
 {#
@@ -62,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/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"]

{truss-0.10.9rc545.dist-info → truss-0.10.9rc547.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truss
-Version: 0.10.9rc545
+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.9rc545.dist-info → truss-0.10.9rc547.dist-info}/RECORD

@@ -66,12 +66,12 @@ truss/remote/baseten/utils/time.py,sha256=Ry9GMjYnbIGYVIGwtmv4V8ljWjvdcaCf5NOQzl
 truss/remote/baseten/utils/transfer.py,sha256=d3VptuQb6M1nyS6kz0BAfeOYDLkMKUjatJXpY-mp-As,1548
 truss/templates/README.md.jinja,sha256=N7CJdyldZuJamj5jLh47le0hFBdu9irVsTBqoxhPNPQ,2476
 truss/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truss/templates/base.Dockerfile.jinja,sha256=WzaG559566SvzDGXozdzsJW03zulzoLdrUvj-zVw--M,5410
+truss/templates/base.Dockerfile.jinja,sha256=BTxbuTANKVRTjdLEX2ZZHYoPKD0RK4OCmJof_VDtpp0,5441
 truss/templates/cache.Dockerfile.jinja,sha256=evMbbMXjceDjUmGGuB0shLS_PxZsc9ZGkbzR-6aIW-Q,1114
 truss/templates/cache_requirements.txt,sha256=xoPoJ-OVnf1z6oq_RVM3vCr3ionByyqMLj7wGs61nUs,87
 truss/templates/copy_cache_files.Dockerfile.jinja,sha256=Os5zFdYLZ_AfCRGq4RcpVTObOTwL7zvmwYcvOzd_Zqo,126
 truss/templates/docker_server_requirements.txt,sha256=PyhOPKAmKW1N2vLvTfLMwsEtuGpoRrbWuNo7tT6v2Mc,18
-truss/templates/server.Dockerfile.jinja,sha256=SW9DQwgSiQZrJ4Zo6_qqyB3N4Vvp1iBnCpNFNcC6Lgk,7015
+truss/templates/server.Dockerfile.jinja,sha256=bvp3pzSlGN7qgbEbLpAkR0LUAx3-Ru62dUH6gqgBYFE,7092
 truss/templates/control/requirements.txt,sha256=Kk0tYID7trPk5gwX38Wrt2-YGWZAXFJCJRcqJ8ZzCjc,251
 truss/templates/control/control/application.py,sha256=jYeta6hWe1SkfLL3W4IDmdYjg3ZuKqI_UagWYs5RB_E,3793
 truss/templates/control/control/endpoints.py,sha256=FM-sgao7I3gMoUTasM3Xq_g2LDoJQe75JxIoaQxzeNo,10031
@@ -365,8 +365,8 @@ truss_train/definitions.py,sha256=RZs4bCWkq7gBJALDLgmd4QxjlxWk6GMs2a62kiAalvw,67
 truss_train/deployment.py,sha256=zmeJ66kg1Wc7l7bwA_cXqv85uMF77hYl7NPHuhc1NPs,2493
 truss_train/loader.py,sha256=0o66EjBaHc2YY4syxxHVR4ordJWs13lNXnKjKq2wq0U,1630
 truss_train/public_api.py,sha256=9N_NstiUlmBuLUwH_fNG_1x7OhGCytZLNvqKXBlStrM,1220
-truss-0.10.9rc545.dist-info/METADATA,sha256=pcZBGjyOCHlb9dqTWMJAFj137uCf7QMazPdg4TV2rUI,6674
-truss-0.10.9rc545.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truss-0.10.9rc545.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
-truss-0.10.9rc545.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
-truss-0.10.9rc545.dist-info/RECORD,,
+truss-0.10.9rc547.dist-info/METADATA,sha256=EQqgKEtdA3d9rI8UVCZ-neygWhWRevcbRgKoMzlMxCg,6674
+truss-0.10.9rc547.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truss-0.10.9rc547.dist-info/entry_points.txt,sha256=-MwKfHHQHQ6j0HqIgvxrz3CehCmczDLTD-OsRHnjjuU,130
+truss-0.10.9rc547.dist-info/licenses/LICENSE,sha256=FTqGzu85i-uw1Gi8E_o0oD60bH9yQ_XIGtZbA1QUYiw,1064
+truss-0.10.9rc547.dist-info/RECORD,,