Add Docker Compose and environment configuration for built-in and external PostgreSQL setups

adishM98 · adishM98 · commit 681e80ac01b1 · 2026-01-09T16:30:41.000+05:30
diff --git a/deploy/docker/docker-compose-with-built-in-postgresql/.env.internal.example b/deploy/docker/docker-compose-with-built-in-postgresql/.env.internal.example
@@ -22,8 +22,10 @@ TOOLJET_DB_HOST=postgresql
 TOOLJET_DB_PASS=
 
 PGRST_DB_URI= # postgres://<postgres_username>:<postgres_password><@postgres_hostname>/<database_name>
-PGRST_HOST=postgrest
+PGRST_HOST=localhost:3001
 PGRST_JWT_SECRET= # If you have openssl installed, you can run the following command openssl rand -hex 32 to generate the value for PGRST_JWT_SECRET.
+PGRST_SERVER_PORT=3001
+PGRST_DB_PRE_CONFIG=postgrest.pre_config
 
 # Checks every 24 hours to see if a new version of ToolJet is available
 # (Enabled by default. Set false to disable)
diff --git a/deploy/docker/docker-compose-with-built-in-postgresql/docker-compose.yaml b/deploy/docker/docker-compose-with-built-in-postgresql/docker-compose.yaml
@@ -5,7 +5,7 @@ services:
     tty: true
     stdin_open: true
     container_name: Tooljet-app
-    image: tooljet/tooljet-ce:latest
+    image: tooljet/tooljet-ce:ce-lts-latest
     restart: always
     env_file: .env
     ports:
@@ -28,17 +28,6 @@ services:
       - POSTGRES_USER=${PG_USER}
       - POSTGRES_PASSWORD=${PG_PASS}
 
-  postgrest:
-    container_name: postgrest
-    image: postgrest/postgrest:v12.0.2
-    restart: always
-    depends_on:
-      - postgres
-    env_file: .env
-    environment:
-      - PGRST_SERVER_PORT=80
-      - PGRST_DB_PRE_CONFIG=postgrest.pre_config
-
 volumes:
   postgres:
     driver: local
diff --git a/deploy/docker/docker-compose-with-built-in-postgresql/internal.sh b/deploy/docker/docker-compose-with-built-in-postgresql/internal.sh
diff --git a/deploy/docker/docker-compose-with-external-postgresql/.env.external.example b/deploy/docker/docker-compose-with-external-postgresql/.env.external.example
@@ -22,10 +22,11 @@ TOOLJET_DB_USER= # Postgres database username
 TOOLJET_DB_HOST= # Postgres database host
 TOOLJET_DB_PASS= # Postgres database password
 
-PGRST_HOST=postgrest
+PGRST_HOST=localhost:3001
 PGRST_DB_URI=
 PGRST_JWT_SECRET= # If you have openssl installed, you can run the following command openssl rand -hex 32 to generate the value for PGRST_JWT_SECRET.
-
+PGRST_SERVER_PORT=3001
+PGRST_DB_PRE_CONFIG=postgrest.pre_config
 
 # Checks every 24 hours to see if a new version of ToolJet is available
 # (Enabled by default. Set false to disable)
diff --git a/deploy/docker/docker-compose-with-external-postgresql/docker-compose.yaml b/deploy/docker/docker-compose-with-external-postgresql/docker-compose.yaml
@@ -0,0 +1,16 @@
+version: "3"
+
+services:
+  tooljet:
+    tty: true
+    stdin_open: true
+    container_name: Tooljet-app
+    image: tooljet/tooljet-ce:ce-lts-latest
+    restart: always
+    env_file: .env
+    ports:
+      - 80:80
+    environment:
+      SERVE_CLIENT: "true"
+      PORT: "80"
+    command: npm run start:prod
diff --git a/deploy/docker/docker-compose-with-external-postgresql/external.sh b/deploy/docker/docker-compose-with-external-postgresql/external.sh
diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
diff --git a/docker/ce-entrypoint.sh b/docker/ce-entrypoint.sh
@@ -5,6 +5,24 @@ if [ -f "./.env" ]; then
   export $(grep -v '^#' ./.env | xargs -d '\n') || true
 fi
 
+# Check if PGRST_HOST starts with "localhost"
+if [[ "$PGRST_HOST" == localhost:* ]]; then
+  echo "Starting PostgREST server locally..."
+
+  # Generate PostgREST configuration in a writable directory
+  POSTGREST_CONFIG_PATH="/tmp/postgrest.conf"
+
+  echo "db-uri = \"${PGRST_DB_URI}\"" > "$POSTGREST_CONFIG_PATH"
+  echo "db-pre-config = \"postgrest.pre_config\"" >> "$POSTGREST_CONFIG_PATH"
+  echo "server-port = \"${PGRST_SERVER_PORT}\"" >> "$POSTGREST_CONFIG_PATH"
+
+  # Starting PostgREST
+  echo "Starting PostgREST..."
+  postgrest "$POSTGREST_CONFIG_PATH" &
+else
+  echo "Using external PostgREST at $PGRST_HOST."
+fi
+
 if [ -d "./server/dist" ]; then
   SETUP_CMD='npm run db:setup:prod'
 else
diff --git a/docker/ce-production.Dockerfile b/docker/ce-production.Dockerfile
@@ -35,6 +35,19 @@ RUN npm install -g @nestjs/cli
 RUN npm install -g copyfiles
 RUN npm --prefix server run build
 
+# Install dependencies for PostgREST, curl, tar, etc.
+RUN apt-get update && apt-get install -y \
+    curl ca-certificates tar \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV POSTGREST_VERSION=v12.2.0
+
+RUN curl -Lo postgrest.tar.xz https://github.com/PostgREST/postgrest/releases/download/${POSTGREST_VERSION}/postgrest-v12.2.0-linux-static-x64.tar.xz && \
+    tar -xf postgrest.tar.xz && \
+    mv postgrest /postgrest && \
+    rm postgrest.tar.xz && \
+    chmod +x /postgrest
+
 FROM debian:12
 
 RUN apt-get update -yq \
@@ -103,6 +116,13 @@ RUN useradd --create-home --home-dir /home/appuser appuser \
     && chmod u+x /app \
     && chmod -R g=u /app
 
+# Use the PostgREST binary from the builder stage
+COPY --from=builder --chown=appuser:0 /postgrest /usr/local/bin/postgrest
+
+RUN mv /usr/local/bin/postgrest /usr/local/bin/postgrest-original && \
+    echo '#!/bin/bash\nexec /usr/local/bin/postgrest-original "$@" 2>&1 | sed "s/^/[PostgREST] /"' > /usr/local/bin/postgrest && \
+    chmod +x /usr/local/bin/postgrest
+
 # Set npm cache directory
 ENV npm_config_cache /home/appuser/.npm
 
