chore(dev): remove nested bash shell (yondonfu#72)

This commit ensures that the behavior of the dev container is more
consistent with what developers would expect when using the dev container
Docker image as a standalone image.

Author: rickstaa

.devcontainer/Dockerfile

@@ -33,6 +33,8 @@ RUN mkdir -p /etc/supervisor/conf.d
 COPY .devcontainer/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 WORKDIR /workspace/comfystream
-COPY docker/entrypoint.sh /workspace/comfystream/docker/entrypoint.sh
-RUN chmod +x /workspace/comfystream/docker/entrypoint.sh
-ENTRYPOINT ["/workspace/comfystream/docker/entrypoint.sh"]
+COPY .devcontainer/entrypoint.sh /workspace/comfystream/.devcontainer/entrypoint.sh
+RUN chmod +x /workspace/comfystream/.devcontainer/entrypoint.sh
+
+ENTRYPOINT ["/workspace/comfystream/.devcontainer/entrypoint.sh"]
+CMD ["/bin/bash"]

docker/entrypoint.sh .devcontainer/entrypoint.sh

@@ -44,13 +44,6 @@ if [ "$1" = "--build-engines" ]; then
     shift
 fi
 
-if [ "$1" = "--editable" ]; then
-    cd /workspace/comfystream
-    conda activate comfystream
-    pip install -e .
-    shift
-fi
-
 # Install npm packages if needed
 cd /workspace/comfystream/ui
 if [ ! -d "node_modules" ]; then
@@ -63,4 +56,5 @@ if [ "$1" = "--server" ]; then
 fi
 
 cd /workspace/comfystream
-/bin/bash
+
+exec "$@"

.devcontainer/post-create.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
-chmod +x /workspace/comfystream/docker/entrypoint.sh
+chmod +x /workspace/comfystream/.devcontainer/entrypoint.sh
 cd /workspace/comfystream
 
 # Install Comfystream in editable mode.
-/workspace/comfystream/docker/entrypoint.sh --editable
+echo -e "\e[32mInstalling Comfystream in editable mode...\e[0m"
+/workspace/miniconda3/envs/comfystream/bin/python3 -m pip install -e . > /dev/null
 
 # Create a symlink to the entrypoint script.
-echo 'alias prepare_examples="/workspace/comfystream/docker/entrypoint.sh --download-models --build-engines"' >> ~/.bashrc
+echo 'alias prepare_examples="/workspace/comfystream/.devcontainer/entrypoint.sh --download-models --build-engines"' >> ~/.bashrc
 echo -e "\e[32mContainer ready! Run 'prepare_examples' to download models and build engines for example workflows.\e[0m"
 
 /bin/bash