kanshan/TensorRT-LLMs
1
0
Fork 0
mirror of https://github.com/NVIDIA/TensorRT-LLM.git synced 2026-01-14 06:27:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix docker cache mount (#5763)

Browse Source 
Signed-off-by: Martin Marciniszyn Mehringer <11665257+MartinMarciniszyn@users.noreply.github.com>
This commit is contained in:
Martin Marciniszyn Mehringer 2025-07-07 09:18:55 +02:00 committed by Zhenhuan Chen
parent 6992616c1f
commit c321fb8f81
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/Dockerfile.user
View File

@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1
# check=skip=InvalidDefaultArgInFrom
ARG BASE_IMAGE_WITH_TAG ARG BASE_IMAGE_WITH_TAG
FROM ${BASE_IMAGE_WITH_TAG} AS base FROM ${BASE_IMAGE_WITH_TAG} AS base
@ -10,7 +12,7 @@ ARG GROUP_NAME=root
RUN (getent group ${GROUP_ID} || groupadd --gid ${GROUP_ID} ${GROUP_NAME}) && \ RUN (getent group ${GROUP_ID} || groupadd --gid ${GROUP_ID} ${GROUP_NAME}) && \
(getent passwd ${USER_ID} || useradd --gid ${GROUP_ID} --uid ${USER_ID} --create-home --no-log-init --shell /bin/bash ${USER_NAME}) && \ (getent passwd ${USER_ID} || useradd --gid ${GROUP_ID} --uid ${USER_ID} --create-home --no-log-init --shell /bin/bash ${USER_NAME}) && \
if [ -d /app/tensorrt_llm ]; then chown ${USER_NAME}:${GROUP_NAME} /app/tensorrt_llm; fi && \ if [ -d /app/tensorrt_llm ]; then chown ${USER_ID}:${GROUP_ID} /app/tensorrt_llm; fi && \
apt-get update && \ apt-get update && \
apt-get install -y sudo && \ apt-get install -y sudo && \
adduser ${USER_NAME} sudo && \ adduser ${USER_NAME} sudo && \

13
docker/Makefile
View File

@ -128,8 +128,9 @@ else
endif endif
SOURCE_DIR ?= $(shell readlink -f ..) SOURCE_DIR ?= $(shell readlink -f ..)
CODE_DIR ?= /code/tensorrt_llm CODE_DIR ?= /code/tensorrt_llm
CCACHE_DIR ?= ${CODE_DIR}/cpp/.ccache CCACHE_DIR ?= $(CODE_DIR)/cpp/.ccache
CONAN_DIR ?= ${CODE_DIR}/cpp/.conan CONAN_DIR ?= $(CODE_DIR)/cpp/.conan
USER_CACHE_DIR ?= $(HOME_DIR)/.cache
RUN_CMD ?= RUN_CMD ?=
CONTAINER_NAME ?= tensorrt_llm CONTAINER_NAME ?= tensorrt_llm
WORK_DIR ?= $(CODE_DIR) WORK_DIR ?= $(CODE_DIR)
@ -148,10 +149,10 @@ endif
docker run $(DOCKER_RUN_OPTS) $(DOCKER_RUN_ARGS) \ docker run $(DOCKER_RUN_OPTS) $(DOCKER_RUN_ARGS) \
$(GPU_OPTS) \ $(GPU_OPTS) \
--volume $(SOURCE_DIR):$(CODE_DIR) \ --volume $(SOURCE_DIR):$(CODE_DIR) \
$(if $(filter 1,$(LOCAL_USER)),--volume ${HOME_DIR}/.cache:/home/${USER_NAME}/.cache:rw) \ $(if $(and $(filter 1,$(LOCAL_USER)),$(shell [ -w "$(USER_CACHE_DIR)" ] && echo 1)),--volume $(USER_CACHE_DIR):/home/$(USER_NAME)/.cache:rw) \
--env "CCACHE_DIR=${CCACHE_DIR}" \ --env "CCACHE_DIR=$(CCACHE_DIR)" \
--env "CCACHE_BASEDIR=${CODE_DIR}" \ --env "CCACHE_BASEDIR=$(CODE_DIR)" \
--env "CONAN_HOME=${CONAN_DIR}" \ --env "CONAN_HOME=$(CONAN_DIR)" \
--workdir $(WORK_DIR) \ --workdir $(WORK_DIR) \
--hostname $(shell hostname)-$* \ --hostname $(shell hostname)-$* \
--name $(CONTAINER_NAME)-$*-$(USER_NAME) \ --name $(CONTAINER_NAME)-$*-$(USER_NAME) \