diff --git a/README.md b/README.md index 8f06a8f..98013b9 100644 --- a/README.md +++ b/README.md @@ -42,4 +42,11 @@ now vist http://localhost:1337 in your browser ## dev -tbd +`docker compose up -d f0ckm-db` + +on dev machine: + +`npm i` +`npm run dev` + +now visit http://localhost:1337 in your browser, you can develop without needing to rebuild the docker image for every change diff --git a/docker-compose.yml b/docker-compose.yml index 1d78b40..c32e3cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,6 @@ services: - ./f0ckm-data/hall_custom/:/opt/f0bm/public/hall_custom/:Z - ./f0ckm-data/manifest.json:/opt/f0bm/public/manifest.json:Z - command: npm run start environment: - GIT_HASH=${f0ckm_TAG:-unknown} ports: diff --git a/package.json b/package.json index 30ba856..e59a58e 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "type": "module", "scripts": { "start": "node --trace-uncaught src/index.mjs", - "dev": "node --trace-uncaught --watch src/index.mjs", + "dev": "STORAGE_DIR=f0ckm-data DB_HOST=localhost DB_PORT=5454 node --trace-uncaught --watch src/index.mjs", "trigger": "node debug/trigger.mjs", "autotagger": "node debug/autotagger.mjs", "thumbnailer": "node debug/thumbnailer.mjs", diff --git a/src/inc/config.mjs b/src/inc/config.mjs index 7482c46..fb238a2 100644 --- a/src/inc/config.mjs +++ b/src/inc/config.mjs @@ -7,6 +7,7 @@ let config = JSON.parse(JSON.stringify(_config)); // Environment variable overrides for database connection if (process.env.DB_HOST) config.sql.host = process.env.DB_HOST; +if (process.env.DB_PORT) config.sql.port = parseInt(process.env.DB_PORT, 10); if (process.env.DB_USER) config.sql.user = process.env.DB_USER; if (process.env.DB_PASS) config.sql.password = process.env.DB_PASS; if (process.env.DB_NAME) config.sql.database = process.env.DB_NAME;