Skip to content

Commit 867fe13

Browse files
committed
Unifies directory structure in dev and prod containers
1 parent 95208a5 commit 867fe13

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

backend/config/sqlite-test-db.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"knex": {
55
"client": "sqlite3",
66
"connection": {
7-
"filename": "/app/backend/config/mydb.sqlite"
7+
"filename": "/app/config/mydb.sqlite"
88
},
99
"pool": {
1010
"min": 0,

docker/docker-compose.dev.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ services:
2121
volumes:
2222
- npm_data:/data
2323
- le_data:/etc/letsencrypt
24-
- ..:/app
24+
- ../backend:/app
25+
- ../frontend:/app/frontend
26+
- ../global:/app/global
2527
depends_on:
2628
- db
2729
working_dir: /app

docker/rootfs/etc/services.d/manager/run

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mkdir -p /data/letsencrypt-acme-challenge
55
cd /app || echo
66

77
if [ "$DEVELOPMENT" == "true" ]; then
8-
cd /app/backend || exit 1
8+
cd /app || exit 1
99
yarn install
1010
node --max_old_space_size=250 --abort_on_uncaught_exception node_modules/nodemon/bin/nodemon.js
1111
else

scripts/test-dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
77
if hash docker-compose 2>/dev/null; then
88
cd "${DIR}/.."
99
echo -e "${BLUE}${CYAN}Testing Dev Stack ...${RESET}"
10-
docker-compose exec -T npm bash -c "cd /app/backend && task test"
10+
docker-compose exec -T npm bash -c "cd /app && task test"
1111
else
1212
echo -e "${RED}❯ docker-compose command is not available${RESET}"
1313
fi

0 commit comments

Comments
 (0)