el-contador 1.0.2 → 1.0.3

package/.env.example

@@ -1,5 +1,6 @@
-# Used by docker-compose for Postgres and the backend.
 # Copy to .env and set values: cp .env.example .env
+# These are used by Docker: the PostgreSQL container creates this user and database
+# automatically on first run. You do not need to install PostgreSQL or create them manually.
 
 DB_USER=el_contador
 DB_PASSWORD=

package/README.md

@@ -4,6 +4,8 @@ Bookkeeping and expense management – expenses, sales, bank transactions, and r
 
 ## Install (first time)
 
+You do **not** need to install PostgreSQL on the host or create a database/user manually. The first run creates everything from your `.env`: PostgreSQL runs in a container and creates the user and database automatically; the app then applies the schema and creates the admin user.
+
 1. Create a project directory and add the package:
 
    ```bash
@@ -12,16 +14,22 @@ Bookkeeping and expense management – expenses, sales, bank transactions, and r
    npm install el-contador
    ```
 
-2. Copy the env template and set at least `DB_PASSWORD` and `SESSION_SECRET`:
+2. Create `.env` with the credentials you want (these will be used to create the PostgreSQL user and database on first run):
 
    ```bash
    cp node_modules/el-contador/.env.example .env
-   # Edit .env: set DB_PASSWORD and SESSION_SECRET
    ```
 
-   `.env` is never published with the package (it is gitignored and not in the published files). Each installation uses its own `.env`; you can also set the Gemini API key later in the admin under **Invoice settings** (see below).
+   Edit `.env` and set at least:
+
+   - **DB_PASSWORD** – password for the database (required).
+   - **SESSION_SECRET** – long random string for session cookies.
+
+   Optional: **DB_USER** (default `el_contador`), **DB_NAME** (default `el_contador_finance`). The first run will create this PostgreSQL user and database inside the container; no separate setup needed.
+
+   Run `npx el-contador` (or `docker compose ...`) from the **same directory** that contains `.env`. If you see `Set DB_PASSWORD in .env`, create or fix `.env` in that directory.
 
-3. Start the app:
+3. Start the app (this starts PostgreSQL and the backend; on first run the DB and admin user are created):
 
    ```bash
    npx el-contador
@@ -33,7 +41,7 @@ Bookkeeping and expense management – expenses, sales, bank transactions, and r
    docker compose -f node_modules/el-contador/docker-compose.yml --env-file .env up -d
    ```
 
-4. Open the admin UI at `http://localhost:3080` (or the port in `ADMIN_PORT`). Log in with the admin user (see `.env`: `INIT_ADMIN_EMAIL` / `INIT_ADMIN_PASSWORD`, or `DB_PASSWORD` if `INIT_ADMIN_PASSWORD` is not set).
+4. Open the admin UI at `http://localhost:3080` (or the port in `ADMIN_PORT`). Log in with the admin user: **INIT_ADMIN_EMAIL** from `.env` (default `admin@example.com`), and **INIT_ADMIN_PASSWORD** or **DB_PASSWORD** if not set.
 
 ## Deploy on another server
 

package/bin/cli.js

@@ -11,12 +11,22 @@ const hasEnv = fs.existsSync(envFile);
 
 const cmd = process.argv[2] || 'start';
 
-function composeArgs(sub) {
-  const a = ['compose', '-f', composePath];
-  if (hasEnv) a.push('--env-file', envFile);
-  return a.concat(sub);
+// Prefer "docker compose" (plugin); fall back to "docker-compose" (standalone) on older hosts
+function getComposeRunner() {
+  const r = spawnSync('docker', ['compose', 'version'], { encoding: 'utf8' });
+  if (r.status === 0) {
+    return { bin: 'docker', args: (sub) => ['compose', '-f', composePath].concat(hasEnv ? ['--env-file', envFile] : []).concat(sub) };
+  }
+  const r2 = spawnSync('docker-compose', ['--version'], { encoding: 'utf8' });
+  if (r2.status === 0) {
+    return { bin: 'docker-compose', args: (sub) => ['-f', composePath].concat(hasEnv ? ['--env-file', envFile] : []).concat(sub) };
+  }
+  console.error('el-contador: need "docker compose" or "docker-compose". Install Docker and Docker Compose.');
+  process.exit(1);
 }
 
+const runner = getComposeRunner();
+
 if (cmd === 'update') {
   const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
   const r = spawnSync(npm, ['update', 'el-contador'], { cwd, stdio: 'inherit' });
@@ -30,12 +40,12 @@ if (cmd === 'start' || cmd === 'up' || cmd === 'update') {
     process.exit(1);
   }
   if (!hasEnv) console.warn('el-contador: no .env in current directory; copy from node_modules/el-contador/.env.example');
-  const args = composeArgs(['up', '-d']);
+  const args = runner.args(['up', '-d']);
   if (cmd === 'update') args.push('--build');
-  const r = spawnSync('docker', args, { stdio: 'inherit', cwd });
+  const r = spawnSync(runner.bin, args, { stdio: 'inherit', cwd });
   process.exit(r.status !== null ? r.status : 1);
 } else if (cmd === 'down' || cmd === 'stop') {
-  const r = spawnSync('docker', composeArgs(['down']), { stdio: 'inherit', cwd });
+  const r = spawnSync(runner.bin, runner.args(['down']), { stdio: 'inherit', cwd });
   process.exit(r.status !== null ? r.status : 1);
 } else {
   console.log('Usage: el-contador [start|up|down|stop|update]');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "el-contador",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Bookkeeping and expense management – run with Docker",
   "keywords": ["bookkeeping", "expenses", "docker", "accounting", "finance"],
   "license": "MIT",