Adds SSH to assistant containers (#103)

microsoft · Oct 8, 2024 · d0859f1 · d0859f1
1 parent 189a183
commit d0859f1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/tools/docker/Dockerfile.assistant b/tools/docker/Dockerfile.assistant
@@ -27,6 +27,20 @@ FROM ${python_image}
 
 ARG app
 
+# BEGIN: enable ssh in azure web app - comment out if not needed
+########
+# install sshd and set password for root
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    openssh-server \
+    && rm -rf /var/lib/apt/lists/* \
+    && echo "root:Docker!" | chpasswd
+
+# azure sshd config
+COPY ./tools/docker/azure_website_sshd.conf /etc/ssh/sshd_config
+ENV SSHD_PORT=2222
+########
+# END: enable ssh in azure web app
+
 COPY --from=build /packages/assistants/assistant/.venv /packages/assistants/assistant/.venv
 ENV PATH=/packages/assistants/assistant/.venv/bin:$PATH
 

diff --git a/tools/makefiles/docker.mk b/tools/makefiles/docker.mk
@@ -1,6 +1,7 @@
 DOCKER_REGISTRY_NAME ?=
+ifneq ($(DOCKER_REGISTRY_NAME),)
 DOCKER_REGISTRY_HOST ?= $(DOCKER_REGISTRY_NAME).azurecr.io
-DOCKER_USERNAME ?= $(DOCKER_REGISTRY_NAME)
+endif
 DOCKER_IMAGE_TAG ?= $(shell git rev-parse HEAD)
 DOCKER_PUSH_LATEST ?= true
 DOCKER_PATH ?= .