Support port or ASSISTANT__PORT env vars (#91)

microsoft · Oct 6, 2024 · 3661dad · 3661dad
1 parent 493f478
commit 3661dad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/tools/docker/Dockerfile.assistant b/tools/docker/Dockerfile.assistant
@@ -33,9 +33,10 @@ ENV PATH=/packages/assistants/assistant/.venv/bin:$PATH
 COPY ./tools/docker/docker-entrypoint.sh /scripts/docker-entrypoint.sh
 RUN chmod +x /scripts/docker-entrypoint.sh
 
+ENV port=3001
 ENV ASSISTANT_APP=${app}
 ENV ASSISTANT__HOST=0.0.0.0
-ENV ASSISTANT__PORT=3000
+ENV ASSISTANT__PORT=${port}
 
 SHELL ["/bin/bash", "-c"]
 ENTRYPOINT ["/scripts/docker-entrypoint.sh"]

diff --git a/tools/makefiles/python.mk b/tools/makefiles/python.mk
@@ -1,4 +1,5 @@
 this_dir = $(patsubst %/,%,$(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
+include $(this_dir)/shell.mk
 
 .DEFAULT_GOAL ?= install
 
@@ -31,11 +32,8 @@ lint:
 format:
 	uvx ruff format .
 
-ifneq ($(findstring pytest,$(shell uv tree --depth 1)),)
+ifneq ($(findstring pytest,$(if $(shell command -v uv $(null_stderr)),$(shell uv tree --depth 1),)),)
 .PHONY: test
 test:
 	uv run pytest $(PYTEST_ARGS)
 endif
-
-
-include $(this_dir)/shell.mk
diff --git a/tools/makefiles/shell.mk b/tools/makefiles/shell.mk
@@ -13,4 +13,3 @@ touch = type nul >> $(call fix_path,$(1)) && copy /y /b $(call fix_path,$(1))+,,
 true_expression = VER>NUL
 null_stderr = 2>NUL
 endif
-