address review: move docker files to docker/, namespace env vars

Move Dockerfile, docker-compose.yml, generate-env.sh, .env.example
into docker/ to keep the repo root clean.

Namespace all config env var overrides with NICTOOL_ prefix to match
NicTool 2 conventions (NICTOOL_DB_HOST, NICTOOL_DB_USER_PASSWORD,
NICTOOL_HTTP_HOST, etc). DB_ROOT_PASSWORD stays unprefixed as it's
a MariaDB convention shared with NicTool 2.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: aberoham

.github/workflows/ci.yml

@@ -92,17 +92,17 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Generate .env
-        run: ./generate-env.sh
+        run: ./docker/generate-env.sh
       - name: Build and start services
-        run: docker compose up --build -d --wait
+        run: docker compose -f docker/docker-compose.yml up --build -d --wait
       - name: Run tests
-        run: docker compose exec api npm test
+        run: docker compose -f docker/docker-compose.yml exec api npm test
       - name: Logs on failure
         if: failure()
-        run: docker compose logs
+        run: docker compose -f docker/docker-compose.yml logs
       - name: Tear down
         if: always()
-        run: docker compose down -v
+        run: docker compose -f docker/docker-compose.yml down -v
 
   test-win:
     needs: [ get-lts ]

.env.example docker/.env.example.env.example renamed to docker/.env.example

@@ -1,5 +1,5 @@
 # NicTool API environment configuration
-# Copy to .env, or run: ./dist/setup/generate-env.sh
+# Copy to .env, or run: ./docker/generate-env.sh
 
 # --- Database (MariaDB/MySQL) ---
 DB_ROOT_PASSWORD=changeme
@@ -8,13 +8,10 @@ NICTOOL_DB_USER=nictool
 NICTOOL_DB_USER_PASSWORD=changeme
 
 # --- API config overrides (optional, override conf.d/*.toml defaults) ---
-# DB_HOST=127.0.0.1
-# DB_PORT=3306
-# DB_USER=nictool
-# DB_PASSWORD=
-# DB_NAME=nictool
-# HTTP_HOST=localhost
-# HTTP_PORT=3000
+# NICTOOL_DB_HOST=127.0.0.1
+# NICTOOL_DB_PORT=3306
+# NICTOOL_HTTP_HOST=localhost
+# NICTOOL_HTTP_PORT=3000
 
 # --- Docker Compose port mapping ---
 # DB_PORT=3307

Dockerfile docker/DockerfileDockerfile renamed to docker/Dockerfile

@@ -10,8 +10,8 @@ services:
       SQL_DIR: /sql
     volumes:
       - db-data:/var/lib/mysql
-      - ./sql:/sql:ro
-      - ./sql/init-mysql.sh:/docker-entrypoint-initdb.d/init-mysql.sh:ro
+      - ../sql:/sql:ro
+      - ../sql/init-mysql.sh:/docker-entrypoint-initdb.d/init-mysql.sh:ro
     ports:
       - "${DB_PORT:-3307}:3306"
     healthcheck:
@@ -21,19 +21,21 @@ services:
       retries: 10
 
   api:
-    build: .
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
     ports:
       - "${API_PORT:-3000}:3000"
     depends_on:
       db:
         condition: service_healthy
     environment:
       NODE_ENV: development
-      DB_HOST: db
-      DB_USER: ${NICTOOL_DB_USER:-nictool}
-      DB_PASSWORD: ${NICTOOL_DB_USER_PASSWORD}
-      DB_NAME: ${NICTOOL_DB_NAME:-nictool}
-      HTTP_HOST: "0.0.0.0"
+      NICTOOL_DB_HOST: db
+      NICTOOL_DB_USER: ${NICTOOL_DB_USER:-nictool}
+      NICTOOL_DB_USER_PASSWORD: ${NICTOOL_DB_USER_PASSWORD}
+      NICTOOL_DB_NAME: ${NICTOOL_DB_NAME:-nictool}
+      NICTOOL_HTTP_HOST: "0.0.0.0"
     healthcheck:
       test: ["CMD", "node", "-e", "fetch('http://localhost:3000/documentation').then(r=>{if(!r.ok)process.exit(1)}).catch(()=>process.exit(1))"]
       interval: 10s

docker-compose.yml docker/docker-compose.ymldocker-compose.yml renamed to docker/docker-compose.yml

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-ENV_FILE="$(cd "$(dirname "$0")/../.." && pwd)/.env"
+ENV_FILE="$(cd "$(dirname "$0")" && pwd)/.env"
 
 if [ -f "$ENV_FILE" ]; then
     echo ".env already exists, not overwriting." >&2
@@ -13,7 +13,7 @@ NT_DB_PW=$(openssl rand -base64 24)
 
 cat > "$ENV_FILE" <<EOF
 # NicTool API environment configuration
-# Generated by dist/setup/generate-env.sh
+# Generated by docker/generate-env.sh
 
 # --- Database (MariaDB/MySQL) ---
 DB_ROOT_PASSWORD=$DB_ROOT_PW
@@ -22,13 +22,10 @@ NICTOOL_DB_USER=nictool
 NICTOOL_DB_USER_PASSWORD=$NT_DB_PW
 
 # --- API config overrides (optional, override conf.d/*.toml defaults) ---
-# DB_HOST=127.0.0.1
-# DB_PORT=3306
-# DB_USER=nictool
-# DB_PASSWORD=
-# DB_NAME=nictool
-# HTTP_HOST=localhost
-# HTTP_PORT=3000
+# NICTOOL_DB_HOST=127.0.0.1
+# NICTOOL_DB_PORT=3306
+# NICTOOL_HTTP_HOST=localhost
+# NICTOOL_HTTP_PORT=3000
 
 # --- Docker Compose port mapping ---
 # DB_PORT=3307

generate-env.sh docker/generate-env.shgenerate-env.sh renamed to docker/generate-env.sh

@@ -51,15 +51,15 @@ class Config {
 
 function applyEnvOverrides(name, cfg) {
   if (name === 'mysql') {
-    if (process.env.DB_HOST) cfg.host = process.env.DB_HOST
-    if (process.env.DB_PORT) cfg.port = parseInt(process.env.DB_PORT)
-    if (process.env.DB_USER) cfg.user = process.env.DB_USER
-    if (process.env.DB_PASSWORD) cfg.password = process.env.DB_PASSWORD
-    if (process.env.DB_NAME) cfg.database = process.env.DB_NAME
+    if (process.env.NICTOOL_DB_HOST) cfg.host = process.env.NICTOOL_DB_HOST
+    if (process.env.NICTOOL_DB_PORT) cfg.port = parseInt(process.env.NICTOOL_DB_PORT)
+    if (process.env.NICTOOL_DB_USER) cfg.user = process.env.NICTOOL_DB_USER
+    if (process.env.NICTOOL_DB_USER_PASSWORD) cfg.password = process.env.NICTOOL_DB_USER_PASSWORD
+    if (process.env.NICTOOL_DB_NAME) cfg.database = process.env.NICTOOL_DB_NAME
   }
   if (name === 'http') {
-    if (process.env.HTTP_HOST) cfg.host = process.env.HTTP_HOST
-    if (process.env.HTTP_PORT) cfg.port = parseInt(process.env.HTTP_PORT)
+    if (process.env.NICTOOL_HTTP_HOST) cfg.host = process.env.NICTOOL_HTTP_HOST
+    if (process.env.NICTOOL_HTTP_PORT) cfg.port = parseInt(process.env.NICTOOL_HTTP_PORT)
   }
 }
 

lib/config.js

@@ -3,7 +3,7 @@ import { describe, it, before, after } from 'node:test'
 
 import Config from './config.js'
 
-const envOverrideKeys = ['DB_HOST', 'DB_PORT', 'DB_USER', 'DB_PASSWORD', 'DB_NAME', 'HTTP_HOST', 'HTTP_PORT']
+const envOverrideKeys = ['NICTOOL_DB_HOST', 'NICTOOL_DB_PORT', 'NICTOOL_DB_USER', 'NICTOOL_DB_USER_PASSWORD', 'NICTOOL_DB_NAME', 'NICTOOL_HTTP_HOST', 'NICTOOL_HTTP_PORT']
 
 describe('config', () => {
   const savedEnv = {}