From 0d19f0f060737f1cd9b478f4a7436abd6c0e6c80 Mon Sep 17 00:00:00 2001
From: badbl0cks <4161747+badbl0cks@users.noreply.github.com>
Date: Tue, 29 Apr 2025 14:01:46 -0700
Subject: [PATCH] Update Docker commands in tasks.json and entrypoint.sh for
 improved service management

- Modified Docker commands in `.vscode/tasks.json` to remove the `-d` flag for running services, allowing for better visibility of logs during development.
- Adjusted `entrypoint.sh` to streamline the startup process by running the development server and npm concurrently, enhancing the development workflow.
---
 .vscode/tasks.json    | 4 ++--
 scripts/entrypoint.sh | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0c6e42a..cbbe65b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -16,7 +16,7 @@
     {
       "label": "Run app & db (both in Docker)",
       "type": "shell",
-      "command": "docker compose -f docker-compose_entire_app.yml up -d",
+      "command": "docker compose -f docker-compose_entire_app.yml up",
       "problemMatcher": []
     },
     {
@@ -28,7 +28,7 @@
     {
       "label": "Run db",
       "type": "shell",
-      "command": "docker compose -f docker-compose_db_only.yml up -d",
+      "command": "docker compose -f docker-compose_db_only.yml up",
       "problemMatcher": []
     }
   ]
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index 21b6cd6..3d1eab3 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -17,9 +17,7 @@ echo "Restarting compose services..."
 docker compose -f docker-compose_db_only.yml down
 docker compose -f docker-compose_db_only.yml up -d
 
-uv run python manage.py runserver &
 cd theme/static_src
-uv run npm run dev
-
-docker compose -f docker-compose_db_only.yml down
-echo "Done!"
\ No newline at end of file
+uv run npm run dev & 
+cd ../../
+uv run python manage.py runserver
\ No newline at end of file