From 22a959bcea211bd038d8dcd6f7db5bbeea76f5b5 Mon Sep 17 00:00:00 2001
From: Stephan <57194608+stephan418@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:08:40 +0100
Subject: [PATCH] FIX: The dev script can now run in any directory

Initially, the directory was required to be called 'server'; This is not the case anymore
---
 dev.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev.sh b/dev.sh
index 0b96319..d6b8e5a 100755
--- a/dev.sh
+++ b/dev.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-DATABASE_PASSWORD=server docker-compose up -d mail postgres redis
+DATABASE_PASSWORD=server COMPOSE_PROJECT_NAME=detleph_server docker-compose up -d mail postgres redis
 
-if [ ! "$(docker ps -a | grep server_dev)" ]; then
-    echo "Creating \"server_dev\" container"
+if [ ! "$(docker ps -a | grep detleph_server_dev)" ]; then
+    echo "Creating the server container"
     
     docker run -it \
-        --name server_dev \
+        --name detleph_server_dev \
         --mount type=bind,source="$(pwd)",target=/app \
-        --network server_default \
+        --network detleph_server_default \
         -p 3000:3000 -e PORT=3000 \
         -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \
         -e DATABASE_USER=server \
@@ -16,11 +16,11 @@ if [ ! "$(docker ps -a | grep server_dev)" ]; then
         --entrypoint "/app/scripts/docker-entrypoint.dev.sh" \
         node
 else
-    echo "Container \"server_dev\" already exists; Starting container"
+    echo "The server container already exists; Starting..."
 
-    docker start -ia server_dev
+    docker start -ia detleph_server_dev
 fi
 
 # After container termination
 
-docker-compose stop
+COMPOSE_PROJECT_NAME=detleph_server docker-compose stop