Postgrest connection fix

slancerk · slancerk · commit aa8fe759986f · 2025-09-16T00:38:42.000+05:30
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -40,6 +40,8 @@ services:
     platform: linux/x86_64
     depends_on:
       - postgres
+    env_file:
+      - .env
     volumes:
       - ./server:/app/server:delegated
       - ./plugins:/app/plugins
@@ -57,7 +59,7 @@ services:
     container_name: postgrest
     image: postgrest/postgrest:v12.0.2
     ports:
-      - "3001:3000"
+      - "3002:3002"
     env_file:
       - .env
     depends_on:
diff --git a/docker/ce-entrypoint.sh b/docker/ce-entrypoint.sh
@@ -15,8 +15,6 @@ if [ -f "./.env" ]; then
   declare $(grep -v '^#' ./.env | xargs)
 fi
 
-export NODE_OPTIONS="--max-old-space-size=4096 --experimental-global-webcrypto"
-
 if [ -z "$DATABASE_URL" ]; then
   ./server/scripts/wait-for-it.sh $PG_HOST:${PG_PORT:-5432} --strict --timeout=300 -- $SETUP_CMD
 else
@@ -30,6 +28,4 @@ else
   ./server/scripts/wait-for-it.sh "$PG_HOST:$PG_PORT" --strict --timeout=300 -- $SETUP_CMD
 fi
 
-
-npm --prefix server run start:dev
-
+exec "$@"
diff --git a/docker/server.Dockerfile.dev b/docker/server.Dockerfile.dev
@@ -27,8 +27,7 @@ COPY ./package.json ./package.json
 
 # install app dependencies
 COPY ./server/package.json ./server/package-lock.json ./server/
-COPY ./docker/ce-entrypoint.sh ./docker/ce-entrypoint.sh
 RUN npm --prefix server install
 COPY ./server/ ./server/
 
-ENTRYPOINT ["./docker/ce-entrypoint.sh"]
+ENTRYPOINT ["./server/ce-entrypoint.sh"]
diff --git a/server/ce-entrypoint.sh b/server/ce-entrypoint.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+if [ -f "./.env" ]; then
+  export $(grep -v '^#' ./.env | xargs -d '\n') || true
+fi
+
+if [ -d "./server/dist" ]; then
+  SETUP_CMD='npm run db:setup:prod'
+else
+  SETUP_CMD='npm run db:setup'
+fi
+
+if [ -f "./.env" ]; then
+  declare $(grep -v '^#' ./.env | xargs)
+fi
+
+export NODE_OPTIONS="--max-old-space-size=4096 --experimental-global-webcrypto"
+
+if [ -z "$DATABASE_URL" ]; then
+  ./server/scripts/wait-for-it.sh $PG_HOST:${PG_PORT:-5432} --strict --timeout=300 -- $SETUP_CMD
+else
+  PG_HOST=$(echo "$DATABASE_URL" | awk -F'[/:@?]' '{print $6}')
+  PG_PORT=$(echo "$DATABASE_URL" | awk -F'[/:@?]' '{print $7}')
+
+  if [ -z "$DATABASE_PORT" ]; then
+    DATABASE_PORT="5432"
+  fi
+
+  ./server/scripts/wait-for-it.sh "$PG_HOST:$PG_PORT" --strict --timeout=300 -- $SETUP_CMD
+fi
+
+npm --prefix server run start:dev
