From 867fe1322bdca87929f6e74196d24605f2b170e8 Mon Sep 17 00:00:00 2001
From: chaptergy <26956711+chaptergy@users.noreply.github.com>
Date: Thu, 8 Oct 2020 13:38:20 +0200
Subject: [PATCH] Unifies directory structure in dev and prod containers

---
 backend/config/sqlite-test-db.json       | 2 +-
 docker/docker-compose.dev.yml            | 4 +++-
 docker/rootfs/etc/services.d/manager/run | 2 +-
 scripts/test-dev                         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/backend/config/sqlite-test-db.json b/backend/config/sqlite-test-db.json
index 2806121..ad54886 100644
--- a/backend/config/sqlite-test-db.json
+++ b/backend/config/sqlite-test-db.json
@@ -4,7 +4,7 @@
       "knex": {
         "client": "sqlite3",
         "connection": {
-          "filename": "/app/backend/config/mydb.sqlite"
+          "filename": "/app/config/mydb.sqlite"
         },
         "pool": {
           "min": 0,
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 24f2ee1..5668dbd 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -21,7 +21,9 @@ services:
     volumes:
       - npm_data:/data
       - le_data:/etc/letsencrypt
-      - ..:/app
+      - ../backend:/app
+      - ../frontend:/app/frontend
+      - ../global:/app/global
     depends_on:
       - db
     working_dir: /app
diff --git a/docker/rootfs/etc/services.d/manager/run b/docker/rootfs/etc/services.d/manager/run
index 3ea1a17..ba0fb05 100755
--- a/docker/rootfs/etc/services.d/manager/run
+++ b/docker/rootfs/etc/services.d/manager/run
@@ -5,7 +5,7 @@ mkdir -p /data/letsencrypt-acme-challenge
 cd /app || echo
 
 if [ "$DEVELOPMENT" == "true" ]; then
-	cd /app/backend || exit 1
+	cd /app || exit 1
 	yarn install
 	node --max_old_space_size=250 --abort_on_uncaught_exception node_modules/nodemon/bin/nodemon.js
 else
diff --git a/scripts/test-dev b/scripts/test-dev
index eb5c5bd..f75527b 100755
--- a/scripts/test-dev
+++ b/scripts/test-dev
@@ -7,7 +7,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 if hash docker-compose 2>/dev/null; then
 	cd "${DIR}/.."
 	echo -e "${BLUE}❯ ${CYAN}Testing Dev Stack ...${RESET}"
-	docker-compose exec -T npm bash -c "cd /app/backend && task test"
+	docker-compose exec -T npm bash -c "cd /app && task test"
 else
 	echo -e "${RED}❯ docker-compose command is not available${RESET}"
 fi