fix: postgres config not mounted

Author: cameri

docker-compose.yml

@@ -10,16 +10,16 @@ services:
       DB_USER: nostr_ts_relay
       DB_PASSWORD: nostr_ts_relay
       DB_NAME: nostr_ts_relay
-      DB_MIN_POOL_SIZE: 5
-      DB_MAX_POOL_SIZE: 25
+      DB_MIN_POOL_SIZE: 16
+      DB_MAX_POOL_SIZE: 32
       REDIS_HOST: cache
       REDIS_PORT: 6379
       REDIS_USER: default
       REDIS_PASSWORD: nostr_ts_relay
       DEBUG: "worker:*"
     user: node:node
     volumes:
-      - $HOME/.nostr:/home/node/
+      - ${PWD}/.nostr:/home/node/
     ports:
       - 8008:8008
     depends_on:
@@ -37,22 +37,27 @@ services:
     image: postgres
     container_name: db
     environment:
+      POSTGRES_DB: nostr_ts_relay
       POSTGRES_USER: nostr_ts_relay
       POSTGRES_PASSWORD: nostr_ts_relay
     volumes:
-      - pgdata:/var/lib/postgresql/data/
-      - ./postgresql.conf:/etc/postgresql/postgresql.conf
+      - pgdata:/var/lib/postgresql/data-old
+      - ${PWD}/.nostr/data:/var/lib/postgresql/data
+      - ${PWD}/.nostr/db-logs:/var/log/postgresql
+      - ${PWD}/postgresql.conf:/postgresql.conf
     ports:
       - 15432:5432
     networks:
       default:
         ipv4_address: 10.10.10.3
+    command: postgres -c 'config_file=/postgresql.conf'
     restart: always
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U nostr_ts_relay"]
       interval: 5s
       timeout: 5s
       retries: 5
+      start_period: 360s
   cache:
     image: redis:7.0.5-alpine3.16
     container_name: cache
@@ -85,7 +90,8 @@ services:
       - ./migrations:/code/migrations
       - ./knexfile.js:/code/knexfile.js
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     networks:
       default:
         ipv4_address: 10.10.10.254
@@ -99,5 +105,5 @@ networks:
         - subnet: 10.10.10.0/24
 
 volumes:
+  cache:
   pgdata:
-  cache:

package.json

@@ -1,7 +1,7 @@
 {
   "name": "nostr-ts-relay",
   "version": "1.10.0",
-  "description": "A nostr relay written in Typescript.",
+  "description": "A Nostr relay written in Typescript.",
   "supportedNips": [
     1,
     2,
@@ -37,13 +37,13 @@
     "pretest:integration": "mkdir -p .test-reports/integration",
     "test:integration": "cucumber-js",
     "cover:integration": "nyc --report-dir .coverage/integration npm run test:integration -- -p cover",
-    "predocker:compose:start": "[ -d \"$HOME/.nostr\" ] || mkdir -p $HOME/.nostr",
+    "predocker:compose:start": "[ -d \"$PWD/.nostr\" ] || mkdir -p $PWD/.nostr",
     "docker:compose:start": "docker compose up --build --remove-orphans",
     "docker:compose:stop": "docker compose down",
     "docker:compose:clean": "docker compose rm",
-    "pretor:docker:compose:start": "mkdir -p $HOME/.nostr/tor/data",
+    "pretor:docker:compose:start": "mkdir -p $PWD/.nostr/tor/data",
     "tor:docker:compose:start": "docker compose -f docker-compose.yml -f docker-compose.tor.yml up --build --remove-orphans",
-    "tor:hostname": "cat $HOME/.nostr/tor/data/nostr-ts-relay/hostname",
+    "tor:hostname": "cat $PWD/.nostr/tor/data/nostr-ts-relay/hostname",
     "tor:docker:compose:stop": "docker compose -f docker-compose.yml -f docker-compose.tor.yml down",
     "docker:integration:run": "docker compose -f ./test/integration/docker-compose.yml run --rm tests",
     "docker:test:integration": "npm run docker:integration:run -- npm run test:integration",
@@ -57,7 +57,8 @@
   },
   "keywords": [
     "nostr",
-    "relay"
+    "relay",
+    "typescript"
   ],
   "author": "Ricardo Arturo Cabral Mejía",
   "license": "MIT",